svn commit: r570476 - /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

[jd...@apache.org]

Author: jdcasey
Date: Tue Aug 28 09:23:27 2007
New Revision: 570476

URL: http://svn.apache.org/viewvc?rev=570476&view=rev
Log:
Fixing NPE when version is null on DefaultArtifact.toString() without removing the NPE throw when the public API getBaseVersion() is called and version is null. Merged from RevId 570473 in artifact trunk.

Modified:
    maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java?rev=570476&r1=570475&r2=570476&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java Tue Aug 28 09:23:27 2007
@@ -101,7 +101,7 @@
         this.artifactId = artifactId;
 
         this.versionRange = versionRange;
-        
+
         selectVersionFromNewRangeIfAvailable();
 
         this.artifactHandler = artifactHandler;
@@ -142,7 +142,7 @@
                                                   "The type cannot be empty." );
         }
 
-        if ( version == null && versionRange == null )
+        if ( ( version == null ) && ( versionRange == null ) )
         {
             throw new InvalidArtifactRTException( groupId, artifactId, getVersion(), type,
                                                   "The version cannot be empty." );
@@ -151,7 +151,7 @@
 
     private boolean empty( String value )
     {
-        return value == null || value.trim().length() < 1;
+        return ( value == null ) || ( value.trim().length() < 1 );
     }
 
     public String getClassifier()
@@ -187,8 +187,8 @@
     public void setVersion( String version )
     {
         this.version = version;
-        this.setBaseVersionInternal( version );
-        this.versionRange = null;
+        setBaseVersionInternal( version );
+        versionRange = null;
     }
 
     public String getType()
@@ -283,9 +283,9 @@
         }
         appendArtifactTypeClassifierString( sb );
         sb.append( ":" );
-        if ( getBaseVersion() != null )
+        if ( getBaseVersionInternal() != null )
         {
-            sb.append( getBaseVersion() );
+            sb.append( getBaseVersionInternal() );
         }
         else
         {
@@ -366,11 +366,21 @@
         return baseVersion;
     }
 
+    protected String getBaseVersionInternal()
+    {
+        if ( ( baseVersion == null ) && ( version != null ) )
+        {
+            setBaseVersionInternal( version );
+        }
+
+        return baseVersion;
+    }
+
     public void setBaseVersion( String baseVersion )
     {
         setBaseVersionInternal( baseVersion );
     }
-    
+
     protected void setBaseVersionInternal( String baseVersion )
     {
         Matcher m = VERSION_FILE_PATTERN.matcher( baseVersion );
@@ -449,7 +459,7 @@
 
     public void setDependencyFilter( ArtifactFilter artifactFilter )
     {
-        this.dependencyFilter = artifactFilter;
+        dependencyFilter = artifactFilter;
     }
 
     public ArtifactHandler getArtifactHandler()
@@ -488,20 +498,20 @@
     public void setVersionRange( VersionRange versionRange )
     {
         this.versionRange = versionRange;
-        
+
         selectVersionFromNewRangeIfAvailable();
     }
-    
+
     private void selectVersionFromNewRangeIfAvailable()
     {
-        if ( versionRange != null && versionRange.getRecommendedVersion() != null )
+        if ( ( versionRange != null ) && ( versionRange.getRecommendedVersion() != null ) )
         {
             selectVersion( versionRange.getRecommendedVersion().toString() );
         }
         else
         {
-            this.version = null;
-            this.baseVersion = null;
+            version = null;
+            baseVersion = null;
         }
     }