From 8522387c40027238decd43f7e5028cca491bf26c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Tue, 10 May 2005 07:37:04 +0000 Subject: [PATCH] fix NPE reported by Curt Arnold git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278239 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ src/main/org/apache/tools/ant/DirectoryScanner.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 084824a49..d7b211804 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -204,6 +204,9 @@ Fixed bugs: * DirectoryScanner.slowScan() was broken. Bugzilla report 34722. +* DirectoryScanner.scan() could throw a NullPointerException on + case-insensitive filesystems (read Windows or MacOS X). + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index a2534a1bb..0bf8267ad 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -872,7 +872,7 @@ public class DirectoryScanner } if ((myfile == null || !myfile.exists()) && !isCaseSensitive()) { File f = findFile(basedir, currentelement, false); - if (f.exists()) { + if (f != null && f.exists()) { // adapt currentelement to the case we've // actually found currentelement = FILE_UTILS.removeLeadingPath(basedir,