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 MacroInstance.java
Date Tue, 17 Aug 2004 18:20:04 GMT
peterreilly    2004/08/17 11:20:04

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        MacroInstance.java
  Log:
  sync with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.125 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.124
  retrieving revision 1.503.2.125
  diff -u -r1.503.2.124 -r1.503.2.125
  --- WHATSNEW	13 Aug 2004 09:14:20 -0000	1.503.2.124
  +++ WHATSNEW	17 Aug 2004 18:20:04 -0000	1.503.2.125
  @@ -27,6 +27,9 @@
   * Enable to choose the regexp implementation without system property.
     Bugzilla Report 15390.
   
  +* MacroInstance did not clean up nested elements correctly in the execute method, causing
  +  multiple use of the same marco instance with nested elements to fail.
  +
   Changes from Ant 1.6.1 to Ant 1.6.2
   ===================================
   
  
  
  
  No                   revision
  No                   revision
  1.5.2.22  +5 -2      ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
  
  Index: MacroInstance.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
  retrieving revision 1.5.2.21
  retrieving revision 1.5.2.22
  diff -u -r1.5.2.21 -r1.5.2.22
  --- MacroInstance.java	4 Jun 2004 07:39:09 -0000	1.5.2.21
  +++ MacroInstance.java	17 Aug 2004 18:20:04 -0000	1.5.2.22
  @@ -48,8 +48,8 @@
       private MacroDef macroDef;
       private Map      map = new HashMap();
       private Map      nsElements = null;
  -    private Map      presentElements = new HashMap();
  -    private Hashtable localProperties = new Hashtable();
  +    private Map      presentElements;
  +    private Hashtable localProperties;
       private String    text = null;
       private String    implicitTag =     null;
       private List      unknownElements = new ArrayList();
  @@ -321,6 +321,7 @@
        *
        */
       public void execute() {
  +        presentElements = new HashMap();
           getNsElements();
           processTasks();
           localProperties = new Hashtable();
  @@ -379,5 +380,7 @@
               throw ProjectHelper.addLocationToBuildException(
                   ex, getLocation());
           }
  +        presentElements = null;
  +        localProperties = null;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message