From 67b776a8b5a81f575570cfe38b578262593f191f Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@apache.org>
Date: Thu, 21 Nov 2002 22:42:19 +0000
Subject: [PATCH] Allow multiple <systemPath> ( system path is used to add more
 stuff to the 'main' loader - for example to add junit.jar so that <junit>
 optional task can work )

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273575 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/SystemPath.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/SystemPath.java b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/SystemPath.java
index 6f6cb1684..95c75130d 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/SystemPath.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/SystemPath.java
@@ -120,24 +120,29 @@ public class SystemPath extends Task {
      */
     private void initSystemLoader(Path path) {
         try {
-            if( project.getReference( SYSTEM_LOADER_REF ) != null )
-                return; // already done that.
+            //if( project.getReference( SYSTEM_LOADER_REF ) != null )
+            //    return; // already done that.
             
             // reverse loader
-            AntClassLoader acl=new AntClassLoader( this.getClass().getClassLoader(), true );
-            acl.addLoaderPackageRoot( "org.apache.tools.ant.taskdefs.optional");
-            project.addReference( SYSTEM_LOADER_REF, acl );
-            
-            
+            AntClassLoader acl=(AntClassLoader)project.getReference(SYSTEM_LOADER_REF);
+            if( acl==null ) {
+                acl=new AntClassLoader( this.getClass().getClassLoader(), true );
+                acl.addLoaderPackageRoot( "org.apache.tools.ant.taskdefs.optional");
+                project.addReference( SYSTEM_LOADER_REF, acl );
+            }
+
+
             String list[]=path.list();
             for( int i=0; i<list.length; i++ ) {
                 File f= new File( list[i] );
                 if( f.exists() ) {
                     acl.addPathElement(f.getAbsolutePath());
+                    log("Adding to class loader " +  acl + " " + f.getAbsolutePath(),
+                        Project.MSG_DEBUG);
                 }
             }
             
-            // XXX find the classpath
+            // XXX find the classpath - add the optional jars.
             String antHome=project.getProperty( "ant.home" );
             File optionalJar=new File( antHome + "/lib/optional.jar" );
             if( optionalJar.exists() )