From 17d4b3461a58e4dcf0615db3516222f281e935c0 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 19 Nov 2010 15:44:38 +0000 Subject: [PATCH] Make DirectoryScanner work on buggy JVMs where File.list() returns an empty array rather than null for files. PR 50295. Submitted by Daniel Smith git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1036905 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/DirectoryScanner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 94973bbb6..22d7887b3 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1248,7 +1248,7 @@ public class DirectoryScanner TokenizedPath newPath = new TokenizedPath(path, newfiles[i]); File file = new File(dir, newfiles[i]); String[] children = file.list(); - if (children == null) { // probably file + if (children == null || file.isFile()) { if (isIncluded(newPath)) { accountForIncludedFile(newPath, file); } else {