You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/04/13 17:08:16 UTC
svn commit: r933665 -
/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: jdcasey
Date: Tue Apr 13 15:08:15 2010
New Revision: 933665
URL: http://svn.apache.org/viewvc?rev=933665&view=rev
Log:
[MJAVADOC-275] Don't fail the build if detection of module links (which spawns a build) fails. This can happen when the modules haven't been installed yet.
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?rev=933665&r1=933664&r2=933665&view=diff
==============================================================================
--- 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 Tue Apr 13 15:08:15 2010
@@ -5315,7 +5315,11 @@ public abstract class AbstractJavadocMoj
}
String invokerLogContent = JavadocUtil.readFile( invokerLogFile, "UTF-8" );
- if ( invokerLogContent != null && invokerLogContent.indexOf( JavadocUtil.ERROR_INIT_VM ) == -1 )
+
+ // TODO: Why are we only interested in cases where the JVM won't start?
+ // [MJAVADOC-275][jdcasey] I changed the logic here to only throw an error WHEN
+ // the JVM won't start (opposite of what it was).
+ if ( invokerLogContent != null && invokerLogContent.indexOf( JavadocUtil.ERROR_INIT_VM ) > -1 )
{
throw new MavenReportException( e.getMessage(), e );
}