MNG-2746 fixing an obvious NPE when parent path is a directory and pom is not found. Also reported in MNGECLIPSE-184 and CONTINUUM-1000

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@494085 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Fabrizio Giustina 2007-01-08 15:01:21 +00:00
parent bb6b84a02a
commit bf7d7a01a0
1 changed files with 11 additions and 9 deletions

View File

@ -1092,20 +1092,22 @@ else if ( StringUtils.isEmpty( parentModel.getVersion() ) )
{ {
getLogger().debug( "Parent-POM: " + parentModel.getId() + " for project: " + project.getId() + " cannot be loaded from relative path: " + parentDescriptor + "; path does not exist." ); getLogger().debug( "Parent-POM: " + parentModel.getId() + " for project: " + project.getId() + " cannot be loaded from relative path: " + parentDescriptor + "; path does not exist." );
} }
parentDescriptor = null;
} }
} }
try if ( parentDescriptor != null )
{ {
parentDescriptor = parentDescriptor.getCanonicalFile(); try
} {
catch ( IOException e ) parentDescriptor = parentDescriptor.getCanonicalFile();
{ }
getLogger().debug( "Failed to canonicalize potential parent POM: \'" + parentDescriptor + "\'", e ); catch ( IOException e )
{
getLogger().debug( "Failed to canonicalize potential parent POM: \'" + parentDescriptor + "\'",
e );
parentDescriptor = null; parentDescriptor = null;
}
} }
if ( parentDescriptor != null && parentDescriptor.exists() ) if ( parentDescriptor != null && parentDescriptor.exists() )