cvs commit: jakarta-ant/src/main/org/apache/tools/ant/util SourceFileScanner.java

[conor]

conor       01/09/30 23:58:26

  Modified:    src/main/org/apache/tools/ant/util Tag: ANT_14_BRANCH
                        SourceFileScanner.java
  Log:
  Fix up NPE in SourceFileScanner
  
  Submitted by: Magesh Umasankar <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.4.2   +7 -1      
jakarta-ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java
  
  Index: SourceFileScanner.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java,v
  retrieving revision 1.5.4.1
  retrieving revision 1.5.4.2
  diff -u -w -u -r1.5.4.1 -r1.5.4.2
  --- SourceFileScanner.java    2001/09/27 10:10:51     1.5.4.1
  +++ SourceFileScanner.java    2001/10/01 06:58:26     1.5.4.2
  @@ -121,7 +121,13 @@
                   continue;
               }
   
  -            File src = fileUtils.resolveFile(srcDir, files[i]);
  +            File src = null;
  +            if (srcDir == null) {
  +                src = new File(files[i]);
  +            } else {
  +                src = fileUtils.resolveFile(srcDir, files[i]);
  +            }
  +
               if (src.lastModified() > now) {
                   task.log("Warning: "+files[i]+" modified in the future.", 
                            Project.MSG_WARN);