Browse Source

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
master
Peter Reilly 15 years ago
parent
commit
919c88282c
1 changed files with 0 additions and 6 deletions
  1. +0
    -6
      src/main/org/apache/tools/ant/property/ResolvePropertyMap.java

+ 0
- 6
src/main/org/apache/tools/ant/property/ResolvePropertyMap.java View File

@@ -57,12 +57,6 @@ public class ResolvePropertyMap implements GetProperty {
throw new BuildException( throw new BuildException(
"Property " + name + " was circularly " + "defined."); "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 { try {
seen.add(name); seen.add(name);
return parseProperties.parseProperties((String) map.get(name)); return parseProperties.parseProperties((String) map.get(name));


Loading…
Cancel
Save