[patch] Fixed double property expansion in macrodefs.

double_expansion_fix.diffs (text/plain), 954 bytes, created by Markus Kahl on 2009-12-30 11:36:03 UTC

(hide)

Description: Fixed double property expansion in macrodefs.

Filename:

MIME Type:

Creator: Markus Kahl

Created: 2009-12-30 11:36:03 UTC

Size: 954 bytes

patch

obsolete

>Index: src/main/org/apache/tools/ant/RuntimeConfigurable.java >=================================================================== >--- src/main/org/apache/tools/ant/RuntimeConfigurable.java (Revision 894693) >+++ src/main/org/apache/tools/ant/RuntimeConfigurable.java (Arbeitskopie) >@@ -388,7 +388,13 @@ > String value = (String) attributeMap.get(name); > > // reflect these into the target >- Object attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value); >+ Object attrValue = null; >+ if (!(target instanceof org.apache.tools.ant.taskdefs.MacroInstance)) { >+ attrValue = PropertyHelper.getPropertyHelper(p).parseProperties(value); >+ } else { >+ // do not expand properties in MacroInstances >+ attrValue = value; >+ } > try { > ih.setAttribute(p, target, name, attrValue); > } catch (UnsupportedAttributeException be) { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]