diff --git a/src/main/org/apache/tools/ant/DirectoryScanner.java b/src/main/org/apache/tools/ant/DirectoryScanner.java index 9a3facc83..92d70e4b5 100644 --- a/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/src/main/org/apache/tools/ant/DirectoryScanner.java @@ -1004,19 +1004,10 @@ public class DirectoryScanner * @since ant1.6 */ private boolean isMorePowerfulThanExcludes(String name, String includepattern) { - String shortpattern = SelectorUtils.rtrimWildcardTokens(includepattern); + String soughtexclude = name + File.separator + "**"; for (int counter=0; counter means exclude only the directory foo, but not its subdirs - if (shortexclude.length() < excludes[counter].length()) { - if (excludes[counter].charAt(shortexclude.length()) == File.separatorChar) { - if (matchPath(shortexclude, name, isCaseSensitive)) { - if (shortexclude.length() > shortpattern.length()) { - return false; - } - } - } + if (excludes[counter].equals(soughtexclude)) { + return false; } } return true;