ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java
Date Tue, 10 May 2005 07:37:29 GMT
bodewig     2005/05/10 00:37:29

  Modified:    src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
                        DirectoryScanner.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.64.2.12 +1 -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.64.2.11
  retrieving revision 1.64.2.12
  diff -u -r1.64.2.11 -r1.64.2.12
  --- DirectoryScanner.java	3 May 2005 18:26:35 -0000	1.64.2.11
  +++ DirectoryScanner.java	10 May 2005 07:37:29 -0000	1.64.2.12
  @@ -872,7 +872,7 @@
                   }
                   if ((myfile == null || !myfile.exists()) && !isCaseSensitive())
{
                       File f = findFile(basedir, currentelement, false);
  -                    if (f.exists()) {
  +                    if (f != null && f.exists()) {
                           // adapt currentelement to the case we've
                           // actually found
                           currentelement = FILE_UTILS.removeLeadingPath(basedir,
  
  
  

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


Mime
View raw message