bodewig 01/08/21 23:15:55
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_14_BRANCH
ExecuteOn.java
Log:
Don't lose command line arguments that follow <srcfile /> (and even
better, don't get a NPE from CommandLine.toString).
Revision Changes Path
No revision
No revision
1.14.2.1 +7 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
Index: ExecuteOn.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- ExecuteOn.java 2001/07/12 12:06:42 1.14
+++ ExecuteOn.java 2001/08/22 06:15:55 1.14.2.1
@@ -330,7 +330,14 @@
}
} else { // no targetFilePos
+
+ // 0 --> srcIndex
System.arraycopy(orig, 0, result, 0, srcIndex);
+ // srcIndex --> end
+ System.arraycopy(orig, srcIndex, result,
+ srcIndex + srcFiles.length + targetFiles.length,
+ orig.length - srcIndex);
+
}
// fill in source file names
