Browse Source

revert parts of rev 327004

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

+ 1
- 7
src/main/org/apache/tools/ant/types/ArchiveFileSet.java View File

@@ -21,7 +21,6 @@ import java.util.Iterator;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.types.resources.FileResource; import org.apache.tools.ant.types.resources.FileResource;
import org.apache.tools.zip.UnixStat; import org.apache.tools.zip.UnixStat;


@@ -62,7 +61,6 @@ public abstract class ArchiveFileSet extends FileSet {


private boolean fileModeHasBeenSet = false; private boolean fileModeHasBeenSet = false;
private boolean dirModeHasBeenSet = false; private boolean dirModeHasBeenSet = false;
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();


/** Constructor for ArchiveFileSet */ /** Constructor for ArchiveFileSet */
public ArchiveFileSet() { public ArchiveFileSet() {
@@ -143,11 +141,7 @@ public abstract class ArchiveFileSet extends FileSet {
if (hasDir) { if (hasDir) {
throw new BuildException("Cannot set both dir and src attributes"); throw new BuildException("Cannot set both dir and src attributes");
} }
if (getProject()!=null) {
this.src = new FileResource(FILE_UTILS.resolveFile(getProject().getBaseDir(),src.toString()));
} else {
this.src = new FileResource(new File(src.toString()));
}
this.src = src;
} }


/** /**


Loading…
Cancel
Save