Browse Source

[PATCH] bugzilla 40238 - nested macrodef

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@434226 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 19 years ago
parent
commit
1595e25b55
3 changed files with 6 additions and 2 deletions
  1. +1
    -0
      CONTRIBUTORS
  2. +3
    -0
      WHATSNEW
  3. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/MacroInstance.java

+ 1
- 0
CONTRIBUTORS View File

@@ -147,6 +147,7 @@ Martijn Kruithof
Martin Landers
Martin Poeschl
Martin van den Bemt
Mathieu Champlon
Mathieu Peltier
Matt Albrecht
Matt Benson


+ 3
- 0
WHATSNEW View File

@@ -270,6 +270,9 @@ Fixed bugs:
* <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:
--------------



+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/MacroInstance.java View File

@@ -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);
}


Loading…
Cancel
Save