peterreilly 2004/10/27 05:48:35
Modified: . WHATSNEW
src/main/org/apache/tools/ant XmlLogger.java
src/main/org/apache/tools/ant/taskdefs Antlib.java
Log:
NPE using XmlLogger and antlib
check if the value of the name attribute is not null
set the taskname of the antlib task
PR: 31840
Obtained from: Mariano Benitez
Revision Changes Path
1.677 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- WHATSNEW 25 Oct 2004 23:13:39 -0000 1.676
+++ WHATSNEW 27 Oct 2004 12:48:35 -0000 1.677
@@ -132,6 +132,9 @@
* Concat task instance could not be run twice.
Bugzilla report 31814.
+* NPE using XmlLogger and antlib.
+ Bugzilla report 31840.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
1.46 +3 -0 ant/src/main/org/apache/tools/ant/XmlLogger.java
Index: XmlLogger.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/XmlLogger.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XmlLogger.java 17 May 2004 13:43:32 -0000 1.45
+++ XmlLogger.java 27 Oct 2004 12:48:35 -0000 1.46
@@ -291,6 +291,9 @@
Task task = event.getTask();
String name = event.getTask().getTaskName();
+ if (name == null) {
+ name = "";
+ }
taskElement.element.setAttribute(NAME_ATTR, name);
taskElement.element.setAttribute(LOCATION_ATTR,
event.getTask().getLocation().toString());
1.17 +1 -0 ant/src/main/org/apache/tools/ant/taskdefs/Antlib.java
Index: Antlib.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Antlib.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Antlib.java 9 Mar 2004 16:48:03 -0000 1.16
+++ Antlib.java 27 Oct 2004 12:48:35 -0000 1.17
@@ -82,6 +82,7 @@
Antlib antlib = new Antlib();
antlib.setProject(project);
antlib.setLocation(ue.getLocation());
+ antlib.setTaskName("antlib");
antlib.init();
ue.configure(antlib);
return antlib;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
