You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/06/20 23:13:44 UTC
svn commit: r1352324 -
/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Author: rfscholte
Date: Wed Jun 20 21:13:44 2012
New Revision: 1352324
URL: http://svn.apache.org/viewvc?rev=1352324&view=rev
Log:
Remove null-checks, these Maps can never be null.
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java?rev=1352324&r1=1352323&r2=1352324&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java Wed Jun 20 21:13:44 2012
@@ -186,14 +186,12 @@ public class MapVersionsPhase
releaseVersionInfo = new DefaultVersionInfo( releaseDescriptor.getDefaultReleaseVersion() );
releaseVersionIsExplicit = true;
}
- if ( releaseDescriptor.getReleaseVersions() != null )
+
+ String releaseVersion = ( String ) releaseDescriptor.getReleaseVersions().get( projectId );
+ if ( releaseVersion != null )
{
- String releaseVersion = ( String ) releaseDescriptor.getReleaseVersions().get( projectId );
- if ( releaseVersion != null )
- {
- releaseVersionInfo = new DefaultVersionInfo( releaseVersion );
- releaseVersionIsExplicit = true;
- }
+ releaseVersionInfo = new DefaultVersionInfo( releaseVersion );
+ releaseVersionIsExplicit = true;
}
// The next snapshot version defaults to the next version after the release version
@@ -205,14 +203,12 @@ public class MapVersionsPhase
nextSnapshotVersionInfo = new DefaultVersionInfo( releaseDescriptor.getDefaultDevelopmentVersion() );
nextSnapshotVersionIsExplicit = true;
}
- if ( releaseDescriptor.getDevelopmentVersions() != null )
+
+ String nextDevVersion = ( String ) releaseDescriptor.getDevelopmentVersions().get( projectId );
+ if ( nextDevVersion != null )
{
- String nextDevVersion = ( String ) releaseDescriptor.getDevelopmentVersions().get( projectId );
- if ( nextDevVersion != null )
- {
- nextSnapshotVersionInfo = new DefaultVersionInfo( nextDevVersion );
- nextSnapshotVersionIsExplicit = true;
- }
+ nextSnapshotVersionInfo = new DefaultVersionInfo( nextDevVersion );
+ nextSnapshotVersionIsExplicit = true;
}
}