ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java
Date Tue, 03 May 2005 18:26:35 GMT
mbenson     2005/05/03 11:26:35

  Modified:    src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
                        DirectoryScanner.java
  Log:
  Merge
  PR: 34722
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.64.2.11 +9 -0      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.64.2.10
  retrieving revision 1.64.2.11
  diff -u -r1.64.2.10 -r1.64.2.11
  --- DirectoryScanner.java	11 Mar 2005 19:34:00 -0000	1.64.2.10
  +++ DirectoryScanner.java	3 May 2005 18:26:35 -0000	1.64.2.11
  @@ -956,6 +956,12 @@
           try {
               synchronized (this) {
   
  +                // set in/excludes to reasonable defaults if needed:
  +                boolean nullIncludes = (includes == null);
  +                includes = nullIncludes ? new String[] {"**"} : includes;
  +                boolean nullExcludes = (excludes == null);
  +                excludes = nullExcludes ? new String[0] : excludes;
  +
                   String[] excl = new String[dirsExcluded.size()];
                   dirsExcluded.copyInto(excl);
           
  @@ -974,6 +980,9 @@
                                   notIncl[i] + File.separator, false);
                       }
                   }
  +                clearCaches();
  +                includes = nullIncludes ? null : includes;
  +                excludes = nullExcludes ? null : excludes;
               }
           } finally {
               synchronized (slowScanLock) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message