svn commit: r178603 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

[brett]

Author: brett
Date: Wed May 25 23:03:38 2005
New Revision: 178603

URL: http://svn.apache.org/viewcvs?rev=178603&view=rev
Log:
add a null check in the case where there is no parent and no version - 
validation will pick that up later

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=178603&r1=178602&r2=178603&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
 Wed May 25 23:03:38 2005
@@ -52,12 +52,17 @@
             child.setGroupId( parent.getGroupId() );
         }
 
-        // currentVersion
+        // version
+        // TODO: I think according to the latest design docs, we don't want to 
inherit version at all
         if ( child.getVersion() == null )
         {
             // The parent version may have resolved to something different, so 
we take what we asked for...
             // instead of - child.setVersion( parent.getVersion() );
-            child.setVersion( child.getParent().getVersion() );
+            
+            if ( child.getParent() != null )
+            {
+                child.setVersion( child.getParent().getVersion() );
+            }
         }
 
         // inceptionYear
@@ -479,4 +484,4 @@
     }
 
 
-}
\ No newline at end of file
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]