Return-Path: 
 <ant-dev-return-17054-apmail-jakarta-ant-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org
Received: (qmail 9612 invoked by uid 500); 22 Aug 2001 06:21:16 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ant-dev@jakarta.apache.org
list-help: <mailto:ant-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 9603 invoked by uid 500); 22 Aug 2001 06:21:16 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Date: 22 Aug 2001 06:15:55 -0000
Message-ID: <20010822061555.13577.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 ExecuteOn.java
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N

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