You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2010/09/28 16:11:03 UTC
svn commit: r1002167 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Author: brett
Date: Tue Sep 28 14:11:03 2010
New Revision: 1002167
URL: http://svn.apache.org/viewvc?rev=1002167&view=rev
Log:
[MRELEASE-318] fix regression that caused NPE when the project.artifacts were null
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java?rev=1002167&r1=1002166&r2=1002167&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Tue Sep 28 14:11:03 2010
@@ -146,7 +146,7 @@ public class CheckDependencySnapshotsPha
if ( checkArtifact( artifact, originalVersions, artifactMap, releaseDescriptor ) )
{
- snapshotDependencies.add( artifactMap.get( ArtifactUtils.versionlessKey( artifact ) ) );
+ snapshotDependencies.add( getArtifactFromMap( artifact, artifactMap ) );
}
}
}
@@ -258,6 +258,13 @@ public class CheckDependencySnapshotsPha
private static boolean checkArtifact( Artifact artifact, Map originalVersions, Map artifactMapByVersionlessId, ReleaseDescriptor releaseDescriptor )
{
+ Artifact checkArtifact = getArtifactFromMap( artifact, artifactMapByVersionlessId );
+
+ return checkArtifact( checkArtifact, originalVersions, releaseDescriptor );
+ }
+
+ private static Artifact getArtifactFromMap( Artifact artifact, Map artifactMapByVersionlessId )
+ {
String versionlessId = ArtifactUtils.versionlessKey( artifact );
Artifact checkArtifact = (Artifact) artifactMapByVersionlessId.get( versionlessId );
@@ -265,8 +272,7 @@ public class CheckDependencySnapshotsPha
{
checkArtifact = artifact;
}
-
- return checkArtifact( checkArtifact, originalVersions, releaseDescriptor );
+ return checkArtifact;
}
private static boolean checkArtifact( Artifact artifact, Map originalVersions, ReleaseDescriptor releaseDescriptor )