ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject svn commit: r434226 - in /ant/core/trunk: CONTRIBUTORS WHATSNEW src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
Date Wed, 23 Aug 2006 22:32:37 GMT
Author: peterreilly
Date: Wed Aug 23 15:32:36 2006
New Revision: 434226

URL: http://svn.apache.org/viewvc?rev=434226&view=rev
Log:
[PATCH] bugzilla  40238 - nested macrodef

Modified:
    ant/core/trunk/CONTRIBUTORS
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java

Modified: ant/core/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=434226&r1=434225&r2=434226&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=434226&r1=434225&r2=434226&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Aug 23 15:32:36 2006
@@ -270,6 +270,9 @@
 * <rmic> has a new adapter, xnew, to use the -XNew back end on java1.5+.
   By forking rmic, this works on java1.6+. Bugzilla report 38732.
 
+* Copy of UnknownElement in macroinstance was not recursive.
+  Bugzilla report 40238.
+
 Other changes:
 --------------
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java?rev=434226&r1=434225&r2=434226&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java Wed Aug 23 15:32:36
2006
@@ -291,7 +291,7 @@
                 }
                 for (Iterator i = unknownElements.iterator();
                      i.hasNext();) {
-                    UnknownElement child = (UnknownElement) i.next();
+                    UnknownElement child = copy((UnknownElement) i.next());
                     rc.addChild(child.getWrapper());
                     ret.addChild(child);
                 }
@@ -307,7 +307,7 @@
                 }
                 for (Iterator i = list.iterator();
                      i.hasNext();) {
-                    UnknownElement child = (UnknownElement) i.next();
+                    UnknownElement child = copy((UnknownElement) i.next());
                     rc.addChild(child.getWrapper());
                     ret.addChild(child);
                 }



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


Mime
View raw message