Browse Source

pr 42179: Delete cannot handle (NPE) fileset without file or directory specified.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@531575 13f79535-47bb-0310-9956-ffa450edef68
master
Jacobus Martinus Kruithof 18 years ago
parent
commit
051ba1279d
1 changed files with 7 additions and 3 deletions
  1. +7
    -3
      src/main/org/apache/tools/ant/taskdefs/Delete.java

+ 7
- 3
src/main/org/apache/tools/ant/taskdefs/Delete.java View File

@@ -562,12 +562,16 @@ public class Delete extends MatchingTask {
fs = (FileSet) fs.clone();
fs.setProject(getProject());
}
if (!fs.getDir().isDirectory()) {
handle("Directory does not exist:" + fs.getDir());
File fsDir = fs.getDir();
if (fsDir == null) {
throw new BuildException(
"File or Resource without directory or file specified");
} else if (!fsDir.isDirectory()) {
handle("Directory does not exist:" + fsDir);
} else {
resourcesToDelete.add(fs);
if (includeEmpty) {
filesetDirs.add(new ReverseDirs(fs.getDir(), fs
filesetDirs.add(new ReverseDirs(fsDir, fs
.getDirectoryScanner().getIncludedDirectories()));
}
}


Loading…
Cancel
Save