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 Concat.java
Date Fri, 12 Dec 2003 09:09:36 GMT
peterreilly    2003/12/12 01:09:36

  Modified:    src/main/org/apache/tools/ant/taskdefs Concat.java
  Log:
  Fix off-by-one error in concat with fixlastline="yes"
  PR: 25464
  Obtained from: wang liang
  
  Revision  Changes    Path
  1.30      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
  
  Index: Concat.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Concat.java	28 Nov 2003 09:28:04 -0000	1.29
  +++ Concat.java	12 Dec 2003 09:09:36 -0000	1.30
  @@ -797,7 +797,6 @@
                       }
                       continue;
                   }
  -
                   int nRead = getReader().read(cbuf, off, len);
                   if (nRead == -1 || nRead == 0) {
                       reader.close();
  @@ -816,7 +815,7 @@
                               if (i < 0) {
                                   break;
                               }
  -                            addLastChar(cbuf[off + i]);
  +                            addLastChar(cbuf[off + i - 1]);
                           }
                       }
                       len -= nRead;
  
  
  

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


Mime
View raw message