From b3cb9a9d4f526df3bfef0706e46bc82857babdc3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 19 Jan 2001 13:27:00 +0000
Subject: [PATCH] Changed the handling of build.sysclasspath so that Ant should
 behave the same way as Ant 1.2 did - if build.sysclasspath has not been set.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268480 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/org/apache/tools/ant/AntClassLoader.java        | 2 +-
 src/main/org/apache/tools/ant/taskdefs/Javadoc.java      | 2 +-
 src/main/org/apache/tools/ant/types/CommandlineJava.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 9b3b25a19..e7bc33d8c 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -111,7 +111,7 @@ public class AntClassLoader  extends ClassLoader {
      */
     public AntClassLoader(Project project, Path classpath) {
         this.project = project;
-        this.classpath = classpath.concatSystemClasspath();
+        this.classpath = classpath.concatSystemClasspath("ignore");
 
         // JDK > 1.1 should add these by default, but some VMs don't
         addSystemPackageRoot("java");
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 91ffe990d..68be3f4e0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -572,7 +572,7 @@ public class Javadoc extends Task {
         if (classpath == null)
             classpath = Path.systemClasspath;
         else
-            classpath = classpath.concatSystemClasspath();
+            classpath = classpath.concatSystemClasspath("ignore");
 
         if (!javadoc1) {
             toExecute.createArgument().setValue("-classpath");
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index f870a1d32..a27370646 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -190,7 +190,7 @@ public class CommandlineJava implements Cloneable {
         }
         if (classpath != null && classpath.size() > 0) {
             result[pos++] = "-classpath";
-            result[pos++] = classpath.concatSystemClasspath().toString();
+            result[pos++] = classpath.concatSystemClasspath("ignore").toString();
         }
         System.arraycopy(javaCommand.getCommandline(), 0, 
                          result, pos, javaCommand.size());