Browse Source

fix failures

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@463287 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 18 years ago
parent
commit
1cddc5e638
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      src/main/org/apache/tools/ant/types/Path.java

+ 5
- 1
src/main/org/apache/tools/ant/types/Path.java View File

@@ -247,6 +247,7 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
union.setProject(getProject()); union.setProject(getProject());
} }
union.add(c); union.add(c);
setChecked(false);
} }


/** /**
@@ -319,7 +320,8 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
if (isReference()) { if (isReference()) {
return ((Path) getCheckedRef()).list(); return ((Path) getCheckedRef()).list();
} }
return union == null ? new String[0] : union.list();
return assertFilesystemOnly(union) == null
? new String[0] : union.list();
} }


/** /**
@@ -440,7 +442,9 @@ public class Path extends DataType implements Cloneable, ResourceCollection {
super.dieOnCircularReference(stk, p); super.dieOnCircularReference(stk, p);
} else { } else {
if (union != null) { if (union != null) {
stk.push(union);
invokeCircularReferenceCheck(union, stk, p); invokeCircularReferenceCheck(union, stk, p);
stk.pop();
} }
setChecked(true); setChecked(true);
} }


Loading…
Cancel
Save