bodewig 02/05/13 23:21:44
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Javadoc.java
Log:
Fix NPE in <javadoc>
Reported by: Ylan Segal <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.263.2.15 +3 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.14
retrieving revision 1.263.2.15
diff -u -r1.263.2.14 -r1.263.2.15
--- WHATSNEW 10 May 2002 16:06:31 -0000 1.263.2.14
+++ WHATSNEW 14 May 2002 06:21:44 -0000 1.263.2.15
@@ -44,6 +44,9 @@
source files could be found below them. This has been backwards
incompatible and caused problems with custom doclets like xdoclet.
+* Using the doclet, docletpath or docletpathref attributes of
+<javadoc> may have caused NullPointerExceptions.
+
Other changes:
--------------
No revision
No revision
1.96.2.3 +3 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -u -r1.96.2.2 -r1.96.2.3
--- Javadoc.java 10 May 2002 16:06:32 -0000 1.96.2.2
+++ Javadoc.java 14 May 2002 06:21:44 -0000 1.96.2.3
@@ -712,6 +712,7 @@
public void setDoclet(String docletName) {
if (doclet == null) {
doclet = new DocletInfo();
+ doclet.setProject(getProject());
}
doclet.setName(docletName);
}
@@ -724,6 +725,7 @@
public void setDocletPath(Path docletPath) {
if (doclet == null) {
doclet = new DocletInfo();
+ doclet.setProject(getProject());
}
doclet.setPath(docletPath);
}
@@ -737,6 +739,7 @@
public void setDocletPathRef(Reference r) {
if (doclet == null) {
doclet = new DocletInfo();
+ doclet.setProject(getProject());
}
doclet.createPath().setRefid(r);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
