From 1595e25b550ca2eab19c4290f7050630aa1cc2ec Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Wed, 23 Aug 2006 22:32:36 +0000 Subject: [PATCH] [PATCH] bugzilla 40238 - nested macrodef git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@434226 13f79535-47bb-0310-9956-ffa450edef68 --- CONTRIBUTORS | 1 + WHATSNEW | 3 +++ src/main/org/apache/tools/ant/taskdefs/MacroInstance.java | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1ccc112cf..47addd89d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -147,6 +147,7 @@ Martijn Kruithof Martin Landers Martin Poeschl Martin van den Bemt +Mathieu Champlon Mathieu Peltier Matt Albrecht Matt Benson diff --git a/WHATSNEW b/WHATSNEW index 434c6c0de..2e770d470 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -270,6 +270,9 @@ Fixed bugs: * 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: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java index d24ab6c5c..6db83c24a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java @@ -291,7 +291,7 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain } 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 @@ public class MacroInstance extends Task implements DynamicAttribute, TaskContain } 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); }