From 0777fa853af3a619d777adaead96e9c0d1aff291 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Thu, 3 Mar 2005 20:42:43 +0000
Subject: [PATCH] Eliminate possible NPE; note that previous change addressed
 bug 33118 at least partially.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277786 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/DirectoryScanner.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java
index bbad912c6..e68859492 100644
--- a/src/main/org/apache/tools/ant/DirectoryScanner.java
+++ b/src/main/org/apache/tools/ant/DirectoryScanner.java
@@ -773,14 +773,15 @@ public class DirectoryScanner
 
                 if (basedir == null) {
                     illegal = new IllegalStateException("No basedir set");
-                }
-                if (!basedir.exists()) {
-                    illegal = new IllegalStateException("basedir " + basedir
-                                                    + " does not exist");
-                }
-                if (!basedir.isDirectory()) {
-                    illegal = new IllegalStateException("basedir " + basedir
-                                                    + " is not a directory");
+                } else {
+                    if (!basedir.exists()) {
+                        illegal = new IllegalStateException("basedir " + basedir
+                                                        + " does not exist");
+                    }
+                    if (!basedir.isDirectory()) {
+                        illegal = new IllegalStateException("basedir " + basedir
+                                                        + " is not a directory");
+                    }
                 }
                 if (illegal != null) {
                     throw illegal;