Attachment 24782 Details for Bug 42046 – macro double property expansion fix

[patch] macro double property expansion fix

patch.txt (text/plain), 1001 bytes, created by Markus Kahl on 2009-12-30 09:28:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kahl

Created: 2009-12-30 09:28:32 UTC

Size: 1001 bytes

patch

obsolete

>diff -r 413c2bf8d40b src/main/org/apache/tools/ant/RuntimeConfigurable.java
>--- a/src/main/org/apache/tools/ant/RuntimeConfigurable.java	Wed Dec 30 18:21:42 2009 +0100
>+++ b/src/main/org/apache/tools/ant/RuntimeConfigurable.java	Wed Dec 30 18:23:54 2009 +0100
>@@ -385,8 +385,11 @@
>             for (int i = 0; i < attributeNames.size(); i++) {
>                 String name = (String) attributeNames.get(i);
>                 String value = (String) attributeMap.get(name);
>-                // reflect these into the target
>-				value = p.replaceProperties(value);
>+                // reflect these into the target, unless we're talking about a macro here
>+				// since we want to avoid double expansion of properties
>+                if (!(target instanceof org.apache.tools.ant.taskdefs.MacroInstance)) {
>+					value = p.replaceProperties(value);
>+				}
>                 try {
>                     ih.setAttribute(p, target, name, value);
>                 } catch (UnsupportedAttributeException be) {

Actions: View | Diff

Attachments on bug 42046: 24782