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/taskdefs/optional/ide VAJImport.java
Date Tue, 05 Aug 2003 14:24:37 GMT
bodewig     2003/08/05 07:24:37

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/optional/ide Tag:
                        ANT_15_BRANCH VAJImport.java
  Log:
  Merge fix for PR 22080
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.132 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.263.2.131
  retrieving revision 1.263.2.132
  diff -u -r1.263.2.131 -r1.263.2.132
  --- WHATSNEW	25 Jul 2003 08:27:42 -0000	1.263.2.131
  +++ WHATSNEW	5 Aug 2003 14:24:25 -0000	1.263.2.132
  @@ -20,6 +20,9 @@
     causing problems when using a Windows VAJ server from a UNIX server.
     Bugzilla Report 20457.
   
  +* VAJImport task failed with NullPointerException when using DirectoryScanner.
  +  Bugzilla Report 22080.
  +
   Other changes:
   --------------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.5  +1 -0      ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
  
  Index: VAJImport.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
  retrieving revision 1.14.2.4
  retrieving revision 1.14.2.5
  diff -u -r1.14.2.4 -r1.14.2.5
  --- VAJImport.java	25 Jul 2003 08:27:46 -0000	1.14.2.4
  +++ VAJImport.java	5 Aug 2003 14:24:37 -0000	1.14.2.5
  @@ -234,6 +234,7 @@
       protected void importFileset(FileSet fileset) {
           LocalDirectoryScanner ds = new LocalDirectoryScanner();
           fileset.setupDirectoryScanner(ds, this.getProject());
  +        ds.scan();
           if (ds.getIncludedFiles().length == 0) {
               return;
           }
  
  
  

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


Mime
View raw message