From 0852629ad95581dce700769d4f812b6acb1cc87d Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Mon, 10 May 2004 09:19:30 +0000 Subject: [PATCH] Concat throws ArrayIndexOutOfBounds with fixlastline PR: 28820 Reported by: Andre Vanha git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276440 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Concat.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java index ec9b5bbcc..e672ce797 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Concat.java +++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java @@ -677,6 +677,8 @@ public class Concat extends Task { 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 @@ public class Concat extends Task { for (int i = nRead; i > (nRead - lastChars.length); --i) { - if (i < 0) { + if (i <= 0) { break; } addLastChar(cbuf[off + i - 1]);