svn commit: r548510 - /maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

[jdcasey]

Author: jdcasey
Date: Mon Jun 18 15:25:41 2007
New Revision: 548510

URL: http://svn.apache.org/viewvc?view=rev&rev=548510
Log:
OPEN - issue MASSEMBLY-210: repository does not include the parent pom 
http://jira.codehaus.org/browse/MASSEMBLY-210

Fixing NPE when copying a parent-POM whose MavenProject.getFile() returns null.

Modified:
    
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java

Modified: 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?view=diff&rev=548510&r1=548509&r2=548510
==============================================================================
--- 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 (original)
+++ 
maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
 Mon Jun 18 15:25:41 2007
@@ -332,13 +332,16 @@
 
             setAlignment( artifact, groupVersionAlignments );
 
-//            File sourceFile = new File( localRepository.getBasedir(), 
localRepository.pathOf( artifact ) );
-//
-//            if ( !sourceFile.exists() )
-//            {
-//                break;
-//            }
-//
+            if ( ( sourceFile == null ) || !sourceFile.exists() )
+            {
+                sourceFile = new File( localRepository.getBasedir(), 
localRepository.pathOf( artifact ) );
+            }
+
+            if ( !sourceFile.exists() )
+            {
+                break;
+            }
+
             File targetFile = new File( targetRepository.getBasedir(), 
targetRepository.pathOf( artifact ) );
 
             try