From d85d2da8e3133b29b116326c20815d3879ce801b Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 19 Nov 2010 15:47:48 +0000 Subject: [PATCH] restrict impact of fix for PR 50295 on 'good' VMs to an additional syscall for empty directories rather than an additional call for every directory git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1036906 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 22d7887b3..5aff52b7c 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 || file.isFile()) { + if (children == null || (children.length == 0 && file.isFile())) { if (isIncluded(newPath)) { accountForIncludedFile(newPath, file); } else {