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

(-)src/main/org/apache/tools/ant/RuntimeConfigurable.java (-1 / +7 lines)
Lines 388-394 Link Here
388
                String value = (String) attributeMap.get(name);
388
                String value = (String) attributeMap.get(name);
389
389
390
                // reflect these into the target
390
                // reflect these into the target
391
                Object attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value);
391
				Object attrValue = null;
392
				if (!(target instanceof org.apache.tools.ant.taskdefs.MacroInstance)) {
393
					attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value);
394
				} else {
395
					// do not expand properties in MacroInstances
396
					attrValue = value;
397
				}
392
                try {
398
                try {
393
                    ih.setAttribute(p, target, name, attrValue);
399
                    ih.setAttribute(p, target, name, attrValue);
394
                } catch (UnsupportedAttributeException be) {
400
                } catch (UnsupportedAttributeException be) {

Return to bug 41400