From 919c88282cee83bdcbe6aa4f0d10d3977453efd9 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Mon, 22 Feb 2010 15:24:02 +0000
Subject: [PATCH] BZ48768: invalid ignoring of property setting in property
 file

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@912610 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/property/ResolvePropertyMap.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
index debb6d71d..11468135c 100644
--- a/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
+++ b/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
@@ -57,12 +57,6 @@ public class ResolvePropertyMap implements GetProperty {
             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));