ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs LoadProperties.java
Date Wed, 24 Sep 2003 15:58:13 GMT
peterreilly    2003/09/24 08:58:13

  Modified:    src/main/org/apache/tools/ant/taskdefs LoadProperties.java
  Log:
  Roll back check on size of file as it does not deal with
  a prepend/append filter.
  Just use the default size in ChainReaderHelper rather that
  the filesize as the file could be very big.
  
  Revision  Changes    Path
  1.18      +0 -7      ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
  
  Index: LoadProperties.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- LoadProperties.java	24 Sep 2003 15:51:27 -0000	1.17
  +++ LoadProperties.java	24 Sep 2003 15:58:13 -0000	1.18
  @@ -137,18 +137,12 @@
               throw new BuildException("Source file is not a file.");
           }
   
  -        // Check if the source file is empty
  -        if (srcFile.length() == 0) {
  -            return;
  -        }
  -        
           FileInputStream fis = null;
           BufferedInputStream bis = null;
           Reader instream = null;
   
           try {
               final long len = srcFile.length();
  -            final int size = (int) len;
   
               //open up the file
               fis = new FileInputStream(srcFile);
  @@ -160,7 +154,6 @@
               }
   
               ChainReaderHelper crh = new ChainReaderHelper();
  -            crh.setBufferSize(size);
               crh.setPrimaryReader(instream);
               crh.setFilterChains(filterChains);
               crh.setProject(getProject());
  
  
  

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


Mime
View raw message