From 41f7afa119c80b2b27895dd7dff26a11884f4ed0 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 15 Feb 2001 13:39:59 +0000
Subject: [PATCH] Merge in my patches from the 1.3 branch.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268676 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                                  | 3 ---
 src/main/org/apache/tools/ant/types/CommandlineJava.java   | 7 ++++---
 .../org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 2addb4073..5b47f238d 100644
--- a/build.xml
+++ b/build.xml
@@ -558,9 +558,6 @@
           <exclude name="org/apache/tools/ant/taskdefs/TaskdefsTest.java" />
           <exclude name="org/apache/tools/ant/util/regexp/RegexpMatcherTest.java" />
 
-          <!-- currently fails - will be sorted out soon -->
-          <exclude name="org/apache/tools/ant/types/CommandlineJavaTest.java" />
-
           <!-- these depend on order -->
           <exclude name="org/apache/tools/ant/taskdefs/GUnzipTest.java" />
           <exclude name="org/apache/tools/ant/taskdefs/GzipTest.java" />
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index a7d023b46..dd4cbdd6d 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -172,9 +172,10 @@ public class CommandlineJava implements Cloneable {
     }
 
     public String[] getCommandline() {
+        Path fullClasspath = classpath != null ? classpath.concatSystemClasspath("ignore") : null;
         int size = 
             vmCommand.size() + javaCommand.size() + sysProperties.size();
-        if (classpath != null && classpath.size() > 0) {
+        if (fullClasspath != null && fullClasspath.size() > 0) {
             size += 2;
         }
         
@@ -188,9 +189,9 @@ public class CommandlineJava implements Cloneable {
                              result, pos, sysProperties.size());
             pos += sysProperties.size();
         }
-        if (classpath != null && classpath.size() > 0) {
+        if (fullClasspath != null && fullClasspath.size() > 0) {
             result[pos++] = "-classpath";
-            result[pos++] = classpath.concatSystemClasspath("ignore").toString();
+            result[pos++] = fullClasspath.toString();
         }
         System.arraycopy(javaCommand.getCommandline(), 0, 
                          result, pos, javaCommand.size());
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
index 537e4a9f8..00560365c 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
@@ -89,7 +89,6 @@ public class ExecuteWatchdogTest extends TestCase {
 			System.err.println("WARNING: 'build.tests' property is not available !");
 			classpath = System.getProperty("java.class.path");
 		}
-		System.out.println("Using classpath: " + classpath);		
 		return classpath;
 	}