You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/08/04 14:47:51 UTC
svn commit: r562710 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: vsiveton
Date: Sat Aug 4 05:47:50 2007
New Revision: 562710
URL: http://svn.apache.org/viewvc?view=rev&rev=562710
Log:
MJAVADOC-139: NPE out of AbstractJavadocMojo::getSourcePaths() on multimodule project using aggregate
o as suggested, added subProject.getExecutionProject() != null condition
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?view=diff&rev=562710&r1=562709&r2=562710
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sat Aug 4 05:47:50 2007
@@ -1502,11 +1502,14 @@
sourcePaths.addAll( sourceRoots );
}
- String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
- File javadocDir = new File( subProject.getExecutionProject().getBasedir(), javadocDirRelative );
- if ( javadocDir.exists() && javadocDir.isDirectory() )
+ if ( subProject.getExecutionProject() != null )
{
- sourcePaths.add( javadocDir.getAbsolutePath() );
+ String javadocDirRelative = PathUtils.toRelative( project.getBasedir(), getJavadocDirectory().getAbsolutePath() );
+ File javadocDir = new File( subProject.getExecutionProject().getBasedir(), javadocDirRelative );
+ if ( javadocDir.exists() && javadocDir.isDirectory() )
+ {
+ sourcePaths.add( javadocDir.getAbsolutePath() );
+ }
}
}
}