bodewig     2003/07/23 01:07:33

  Modified:    src/main/org/apache/tools/ant DirectoryScanner.java
  Log:
  One more tweak
  
  Revision  Changes    Path
  1.56      +8 -1      ant/src/main/org/apache/tools/ant/DirectoryScanner.java
  
  Index: DirectoryScanner.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- DirectoryScanner.java     23 Jul 2003 07:57:07 -0000      1.55
  +++ DirectoryScanner.java     23 Jul 2003 08:07:33 -0000      1.56
  @@ -658,6 +658,7 @@
               dirsNotIncluded.addElement("");
           }
           checkIncludePatterns();
  +        clearCaches();
       }
   
       /**
  @@ -675,6 +676,12 @@
               newroots.put(newpattern, includes[icounter]);
           }
   
  +        if (newroots.containsKey("")) {
  +            // we are going to scan everything anyway
  +            scandir(basedir, "", true);
  +        } else {
  +            // only scan directories that can include matched files or
  +            // directories
           Enumeration enum2 = newroots.keys();
   
           File canonBase = null;
  @@ -750,7 +757,7 @@
                   }
               }
           }
  -        clearCaches();
  +        }
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to