svn commit: r912610 - /ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java

[peterreilly]

Author: peterreilly
Date: Mon Feb 22 15:24:02 2010
New Revision: 912610

URL: http://svn.apache.org/viewvc?rev=912610&view=rev
Log:
BZ48768: invalid ignoring of property setting in property file

Modified:
    
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java

Modified: 
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java?rev=912610&r1=912609&r2=912610&view=diff
==============================================================================
--- 
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java 
(original)
+++ 
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java 
Mon Feb 22 15:24:02 2010
@@ -57,12 +57,6 @@
             throw new BuildException(
                 "Property " + name + " was circularly " + "defined.");
         }
-        // Note: the master overrides (even if the name is subsequently
-        //       prefixed)
-        Object masterProperty = master.getProperty(name);
-        if (masterProperty != null) {
-            return masterProperty;
-        }
         try {
             seen.add(name);
             return parseProperties.parseProperties((String) map.get(name));