From 051ba1279d96c822e7708a348a4d7bc0393b89f9 Mon Sep 17 00:00:00 2001
From: Jacobus Martinus Kruithof <jkf@apache.org>
Date: Mon, 23 Apr 2007 19:48:43 +0000
Subject: [PATCH] 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
---
 src/main/org/apache/tools/ant/taskdefs/Delete.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 64f097dd6..c439d3e35 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -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()));
                 }
             }