[MRESOLVER-653] NPE in case of failed result (#640)

cstamas · web-flow · commit beab5309de2e · 2025-01-26T20:05:29.000+01:00
Obvious typo: result artifact may be null, it is request artifact that wanted to be checked. Added UT as well. --- https://issues.apache.org/jira/browse/MRESOLVER-653
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/resolution/TrustedChecksumsArtifactResolverPostProcessor.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/resolution/TrustedChecksumsArtifactResolverPostProcessor.java
@@ -162,7 +162,7 @@ final boolean record = ConfigUtils.getBoolean(session, false, CONFIG_PROP_RECORD
         final boolean snapshots = ConfigUtils.getBoolean(session, false, CONFIG_PROP_SNAPSHOTS);
 
         for (ArtifactResult artifactResult : artifactResults) {
-            if (artifactResult.getArtifact().isSnapshot() && !snapshots) {
+            if (artifactResult.getRequest().getArtifact().isSnapshot() && !snapshots) {
                 continue;
             }
             if (artifactResult.isResolved()) {
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/resolution/TrustedChecksumsArtifactResolverPostProcessorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/resolution/TrustedChecksumsArtifactResolverPostProcessorTest.java
@@ -149,6 +149,15 @@ void haveMatchingChecksumPass() {
         assertTrue(artifactResult.isResolved());
     }
 
+    @Test
+    void unresolvedArtifact() {
+        ArtifactResult artifactResult =
+                createArtifactResult(artifactWithTrustedChecksum).setArtifact(null);
+        assertFalse(artifactResult.isResolved());
+
+        subject.postProcess(session, Collections.singletonList(artifactResult)); // no NPE
+    }
+
     @Test
     void haveNoChecksumPass() {
         ArtifactResult artifactResult = createArtifactResult(artifactWithoutTrustedChecksum);

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ final boolean record = ConfigUtils.getBoolean(session, false, CONFIG_PROP_RECORD`
`162`	`162`	`final boolean snapshots = ConfigUtils.getBoolean(session, false, CONFIG_PROP_SNAPSHOTS);`
`163`	`163`
`164`	`164`	`for (ArtifactResult artifactResult : artifactResults) {`
`165`		`- if (artifactResult.getArtifact().isSnapshot() && !snapshots) {`
	`165`	`+ if (artifactResult.getRequest().getArtifact().isSnapshot() && !snapshots) {`
`166`	`166`	`continue;`
`167`	`167`	`}`
`168`	`168`	`if (artifactResult.isResolved()) {`