ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Antlib.java
Date Wed, 27 Oct 2004 12:50:20 GMT
peterreilly    2004/10/27 05:50:20

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
                        XmlLogger.java
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        Antlib.java
  Log:
  sync
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.142 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.141
  retrieving revision 1.503.2.142
  diff -u -r1.503.2.141 -r1.503.2.142
  --- WHATSNEW	21 Oct 2004 13:54:59 -0000	1.503.2.141
  +++ WHATSNEW	27 Oct 2004 12:50:19 -0000	1.503.2.142
  @@ -60,6 +60,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
   ===================================
   
  
  
  
  No                   revision
  No                   revision
  1.39.2.7  +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.39.2.6
  retrieving revision 1.39.2.7
  diff -u -r1.39.2.6 -r1.39.2.7
  --- XmlLogger.java	17 May 2004 13:43:52 -0000	1.39.2.6
  +++ XmlLogger.java	27 Oct 2004 12:50:20 -0000	1.39.2.7
  @@ -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());
  
  
  
  No                   revision
  No                   revision
  1.12.2.5  +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.12.2.4
  retrieving revision 1.12.2.5
  diff -u -r1.12.2.4 -r1.12.2.5
  --- Antlib.java	9 Mar 2004 17:01:32 -0000	1.12.2.4
  +++ Antlib.java	27 Oct 2004 12:50:20 -0000	1.12.2.5
  @@ -83,6 +83,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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message