You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2014/01/03 07:45:25 UTC
svn commit: r1555019 - in /ant/core/trunk: WHATSNEW
src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Author: bodewig
Date: Fri Jan 3 06:45:24 2014
New Revision: 1555019
URL: http://svn.apache.org/r1555019
Log:
NPE in javadoc when no destdir is specified. PR 55949
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1555019&r1=1555018&r2=1555019&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jan 3 06:45:24 2014
@@ -53,6 +53,9 @@ Fixed bugs:
exception.
Bugzilla Report 53964
+ * <javadoc> caused a NullPointerException when no destdir was set.
+ Bugzilla Report 55949
+
Other changes:
--------------
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java?rev=1555019&r1=1555018&r2=1555019&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javadoc.java Fri Jan 3 06:45:24 2014
@@ -2447,7 +2447,7 @@ public class Javadoc extends Task {
if (!postProcessGeneratedJavadocs) {
return;
}
- if (!destDir.isDirectory()) {
+ if (destDir != null && !destDir.isDirectory()) {
log("No javadoc created, no need to post-process anything",
Project.MSG_VERBOSE);
return;