View | Details | Raw Unified | Return to bug 42046
Collapse All | Expand All

(-)a/src/main/org/apache/tools/ant/RuntimeConfigurable.java (-2 / +5 lines)
Lines 385-392 Link Here
385
            for (int i = 0; i < attributeNames.size(); i++) {
385
            for (int i = 0; i < attributeNames.size(); i++) {
386
                String name = (String) attributeNames.get(i);
386
                String name = (String) attributeNames.get(i);
387
                String value = (String) attributeMap.get(name);
387
                String value = (String) attributeMap.get(name);
388
                // reflect these into the target
388
                // reflect these into the target, unless we're talking about a macro here
389
				value = p.replaceProperties(value);
389
				// since we want to avoid double expansion of properties
390
                if (!(target instanceof org.apache.tools.ant.taskdefs.MacroInstance)) {
391
					value = p.replaceProperties(value);
392
				}
390
                try {
393
                try {
391
                    ih.setAttribute(p, target, name, value);
394
                    ih.setAttribute(p, target, name, value);
392
                } catch (UnsupportedAttributeException be) {
395
                } catch (UnsupportedAttributeException be) {

Return to bug 42046