peterreilly 2003/11/13 10:34:47
Modified: 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.5.2.4 +11 -1
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.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- MacroInstance.java 6 Nov 2003 15:01:21 -0000 1.5.2.3
+++ MacroInstance.java 13 Nov 2003 18:34:46 -0000 1.5.2.4
@@ -68,6 +68,7 @@
import org.apache.tools.ant.DynamicConfigurator;
import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.RuntimeConfigurable;
+import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.UnknownElement;
@@ -187,7 +188,13 @@
ret.setQName(ue.getQName());
ret.setTaskName(ue.getTaskName());
ret.setLocation(ue.getLocation());
- ret.setOwningTarget(getOwningTarget());
+ if (getOwningTarget() == null) {
+ Target t = new Target();
+ t.setProject(getProject());
+ ret.setOwningTarget(t);
+ } else {
+ ret.setOwningTarget(getOwningTarget());
+ }
RuntimeConfigurable rc = new RuntimeConfigurable(
ret, ue.getTaskName());
rc.setPolyType(ue.getWrapper().getPolyType());
@@ -255,6 +262,9 @@
}
localProperties.put(attribute.getName(), value);
copyKeys.remove(attribute.getName());
+ }
+ if (copyKeys.contains("id")) {
+ copyKeys.remove("id");
}
if (copyKeys.size() != 0) {
throw new BuildException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
