[patch] Adding checks in addAlmostAll

patch.txt (text/plain), 1.35 KB, created by Christian Hartmann on 2014-02-02 18:46:42 UTC

(hide)

Description: Adding checks in addAlmostAll

Filename:

MIME Type:

Creator: Christian Hartmann

Created: 2014-02-02 18:46:42 UTC

Size: 1.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0 >#P Ant >Index: src/main/org/apache/tools/ant/taskdefs/Ant.java >=================================================================== >--- src/main/org/apache/tools/ant/taskdefs/Ant.java (revision 1563592) >+++ src/main/org/apache/tools/ant/taskdefs/Ant.java (working copy) >@@ -35,6 +35,7 @@ > import org.apache.tools.ant.Project; > import org.apache.tools.ant.ProjectComponent; > import org.apache.tools.ant.ProjectHelper; >+import org.apache.tools.ant.PropertyHelper; > import org.apache.tools.ant.Target; > import org.apache.tools.ant.Task; > import org.apache.tools.ant.MagicNames; >@@ -638,10 +639,14 @@ > newProject.setNewProperty(key, value); > } > } else if (type == PropertyType.USER) { >- newProject.setUserProperty(key, value); >+ if (!PropertyHelper.getPropertyHelper(this.getProject()).getInheritedProperties().containsKey(key)) { >+ newProject.setUserProperty(key, value); >+ } > } else if (type == PropertyType.INHERITED) { >- newProject.setInheritedProperty(key, value); >- } >+ if (!PropertyHelper.getPropertyHelper(this.getProject()).getUserProperties().containsKey(key)) { >+ newProject.setInheritedProperty(key, value); >+ } >+ } > } > } > 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]