peterreilly 2004/05/10 02:42:04
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Concat.java
Log:
sync with head
Revision Changes Path
No revision
No revision
1.28.2.7 +3 -1 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.28.2.6
retrieving revision 1.28.2.7
diff -u -r1.28.2.6 -r1.28.2.7
--- Concat.java 9 Mar 2004 17:01:33 -0000 1.28.2.6
+++ Concat.java 10 May 2004 09:42:04 -0000 1.28.2.7
@@ -677,6 +677,8 @@
private Reader getReader() throws IOException {
if (reader == null) {
+ log("Concating file " + sourceFiles.elementAt(pos),
+ Project.MSG_VERBOSE);
if (encoding == null) {
reader = new BufferedReader(
new FileReader((File) sourceFiles.elementAt(pos)));
@@ -773,7 +775,7 @@
for (int i = nRead;
i > (nRead - lastChars.length);
--i) {
- if (i < 0) {
+ if (i <= 0) {
break;
}
addLastChar(cbuf[off + i - 1]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
