From 4000ee7ee6c2cbd5b6305f382b17d3b47423cdae Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 23 Jul 2003 07:25:59 +0000 Subject: [PATCH] fix new DirectoryScanner tests, still needs to be improved to avoid double-scanning git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274895 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/DirectoryScanner.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 10ea69ab4..c3b42aca1 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -910,6 +910,10 @@ public class DirectoryScanner * @param file included file */ private void accountForIncludedFile(String name, File file) { + if (!filesIncluded.contains(name) + && !filesExcluded.contains(name) + && !filesDeselected.contains(name)) { + if (!isExcluded(name)) { if (isSelected(name, file)) { filesIncluded.addElement(name); @@ -921,7 +925,7 @@ public class DirectoryScanner everythingIncluded = false; filesExcluded.addElement(name); } - + } } /** @@ -932,6 +936,9 @@ public class DirectoryScanner * @param fast */ private void accountForIncludedDir(String name, File file, boolean fast) { + if (!dirsIncluded.contains(name) + && !dirsExcluded.contains(name) + && !dirsDeselected.contains(name)) { if (!isExcluded(name)) { if (isSelected(name, file)) { dirsIncluded.addElement(name); @@ -953,7 +960,7 @@ public class DirectoryScanner scandir(file, name + File.separator, fast); } } - + } } /** * Tests whether or not a name matches against at least one include