peterreilly 2004/01/30 10:47:57 Modified: src/main/org/apache/tools/ant/taskdefs MacroInstance.java Log: forgot to setTaskType when cloning UnknownElement Revision Changes Path 1.19 +5 -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.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- MacroInstance.java 27 Jan 2004 17:43:25 -0000 1.18 +++ MacroInstance.java 30 Jan 2004 18:47:57 -0000 1.19 @@ -261,6 +261,7 @@ ret.setNamespace(ue.getNamespace()); ret.setProject(getProject()); ret.setQName(ue.getQName()); + ret.setTaskType(ue.getTaskType()); ret.setTaskName(ue.getTaskName()); ret.setLocation(ue.getLocation()); if (getOwningTarget() == null) { @@ -287,7 +288,10 @@ while (e.hasMoreElements()) { RuntimeConfigurable r = (RuntimeConfigurable) e.nextElement(); UnknownElement unknownElement = (UnknownElement) r.getProxy(); - String tag = unknownElement.getTaskType().toLowerCase(Locale.US); + String tag = unknownElement.getTaskType(); + if (tag != null) { + tag = tag.toLowerCase(Locale.US); + } MacroDef.TemplateElement templateElement = (MacroDef.TemplateElement) getNsElements().get(tag); if (templateElement == null) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]