svn commit: r178085 - /maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java

[brett]

Author: brett
Date: Mon May 23 23:11:23 2005
New Revision: 178085

URL: http://svn.apache.org/viewcvs?rev=178085&view=rev
Log:
PR: MAVEN-1606
fix NPE in MavenUtils with a poorly formed resource element

Modified:
    maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java

Modified: 
maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java?rev=178085&r1=178084&r2=178085&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java 
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/project/Project.java Mon 
May 23 23:11:23 2005
@@ -983,7 +983,10 @@
 
     private static void resolveDirectory( Resource resource, File basedir ) 
throws IOException
     {
-        resource.setDirectory( MavenUtils.makeAbsolutePath( basedir, 
resource.getDirectory() ) );
+        if ( resource.getDirectory() != null )
+        {
+            resource.setDirectory( MavenUtils.makeAbsolutePath( basedir, 
resource.getDirectory() ) );
+        }
     }
 
     public void addBranch( Branch branch )



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