ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r953281 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/DirectoryScanner.java
Date Thu, 10 Jun 2010 11:30:57 GMT
Author: bodewig
Date: Thu Jun 10 11:30:57 2010
New Revision: 953281

URL: http://svn.apache.org/viewvc?rev=953281&view=rev
Log:
don't scan directories that are excluded recursively - this used to be done everywhere except
for the (most common) case where the directory itself was not explicitly included.  PR 49420

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=953281&r1=953280&r2=953281&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jun 10 11:30:57 2010
@@ -45,6 +45,12 @@ Fixed bugs:
    a temporary file.
    Bugzilla Report 49419.
 
+ * Ant would often scan directories even though there were known to
+   only hold excluded files when evaluating filesets.  This never
+   resulted in worng results but degraded performance of the scan
+   itself.
+   Bugzilla Report 49420.
+
 Other changes:
 --------------
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?rev=953281&r1=953280&r2=953281&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Thu Jun 10 11:30:57
2010
@@ -1255,7 +1255,8 @@ public class DirectoryScanner
                 } else {
                     everythingIncluded = false;
                     dirsNotIncluded.addElement(name);
-                    if (fast && couldHoldIncluded(newPath)) {
+                    if (fast && couldHoldIncluded(newPath)
+                        && !contentsExcluded(newPath)) {
                         scandir(file, newPath, fast, children,
                                 directoryNamesFollowed);
                     }



Mime
View raw message