commit | 393722bf94b768f4b0fe204391aba982557e074d | [log] [tgz] |
---|---|---|
author | John Dennis Casey <jdcasey@apache.org> | Mon Jun 18 22:25:41 2007 +0000 |
committer | John Dennis Casey <jdcasey@apache.org> | Mon Jun 18 22:25:41 2007 +0000 |
tree | bbfd3dec52e0b2bf9f7260bc0bb140332a608a95 | |
parent | 961aab540cc7d2ab5e41189d55f660fa4f384eab [diff] |
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. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@548510 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java index 588a6e2..dba3b88 100755 --- a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java +++ b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
@@ -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