Browse Source

fix ZipFileSet#getRef for referenced ZipFileSets

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274504 13f79535-47bb-0310-9956-ffa450edef68
master
Antoine Levy-Lambert 22 years ago
parent
commit
052d19e952
1 changed files with 5 additions and 7 deletions
  1. +5
    -7
      src/main/org/apache/tools/ant/types/ZipFileSet.java

+ 5
- 7
src/main/org/apache/tools/ant/types/ZipFileSet.java View File

@@ -293,16 +293,14 @@ public class ZipFileSet extends FileSet {
stk.push(this);
dieOnCircularReference(stk, p);
}

Object o = getRefid().getReferencedObject(p);
if (o instanceof FileSet) {
return (AbstractFileSet)(new ZipFileSet((FileSet)o));
}
else if (!(o instanceof ZipFileSet)) {
if (o instanceof ZipFileSet) {
return (AbstractFileSet) o;
} else if (o instanceof FileSet) {
return (new ZipFileSet((FileSet) o));
} else {
String msg = getRefid().getRefId() + " doesn\'t denote a zipfileset or a fileset";
throw new BuildException(msg);
} else {
return (AbstractFileSet) o;
}
}
/**


Loading…
Cancel
Save