You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/17 12:46:52 UTC
svn commit: r816133 - in /maven/maven-3/trunk/maven-compat/src:
main/java/org/apache/maven/artifact/DefaultArtifact.java
test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Author: bentmann
Date: Thu Sep 17 10:46:52 2009
New Revision: 816133
URL: http://svn.apache.org/viewvc?rev=816133&view=rev
Log:
o Fixed inconsistent behavior of version getters
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=816133&r1=816132&r2=816133&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Thu Sep 17 10:46:52 2009
@@ -357,14 +357,11 @@
public String getBaseVersion()
{
- if ( baseVersion == null )
+ if ( baseVersion == null && version != null )
{
- if ( version == null )
- {
- throw new NullPointerException( "version was null for " + groupId + ":" + artifactId );
- }
setBaseVersionInternal( version );
}
+
return baseVersion;
}
Modified: maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=816133&r1=816132&r2=816133&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original)
+++ maven/maven-3/trunk/maven-compat/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Thu Sep 17 10:46:52 2009
@@ -127,4 +127,14 @@
assertTrue( artifact.compareTo( artifact1 ) == 0 );
assertTrue( artifact1.compareTo( artifact ) == 0 );
}
+
+ public void testNonResolvedVersionRangeConsistentlyYieldsNullVersions()
+ throws Exception
+ {
+ VersionRange vr = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
+ artifact = new DefaultArtifact( groupId, artifactId, vr, scope, type, null, artifactHandler );
+ assertEquals( null, artifact.getVersion() );
+ assertEquals( null, artifact.getBaseVersion() );
+ }
+
}