Browse Source

Nested mappers didn't work for references

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274560 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
3168ce7129
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      src/main/org/apache/tools/ant/types/PropertySet.java

+ 7
- 2
src/main/org/apache/tools/ant/types/PropertySet.java View File

@@ -177,6 +177,10 @@ public class PropertySet extends DataType {
return getRef().dynamic; return getRef().dynamic;
} }


public Mapper getMapper() {
return getRef()._mapper;
}

public Properties getProperties() { public Properties getProperties() {
Vector names = null; Vector names = null;
Project prj = getProject(); Project prj = getProject();
@@ -193,8 +197,9 @@ public class PropertySet extends DataType {
} }


FileNameMapper mapper = null; FileNameMapper mapper = null;
if (_mapper != null) {
mapper = _mapper.getImplementation();
Mapper myMapper = getMapper();
if (myMapper != null) {
mapper = myMapper.getImplementation();
} }
Properties properties = new Properties(); Properties properties = new Properties();
for (Enumeration e = names.elements(); e.hasMoreElements();) { for (Enumeration e = names.elements(); e.hasMoreElements();) {


Loading…
Cancel
Save