svn commit: r698943 - in /ant/core/trunk: CONTRIBUTORS contributors.xml src/main/org/apache/tools/ant/taskdefs/Classloader.java

[bo...@apache.org]

Author: bodewig
Date: Thu Sep 25 05:26:31 2008
New Revision: 698943

URL: http://svn.apache.org/viewvc?rev=698943&view=rev
Log:
only add classpath elements to existing loaders, not to a freshly created one.  PR 45847.

Modified:
    ant/core/trunk/CONTRIBUTORS
    ant/core/trunk/contributors.xml
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java

Modified: ant/core/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=698943&r1=698942&r2=698943&view=diff
==============================================================================
Binary files - no diff available.

Modified: ant/core/trunk/contributors.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=698943&r1=698942&r2=698943&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Thu Sep 25 05:26:31 2008
@@ -962,6 +962,10 @@
   </name>
   <name>
     <first>Robert</first>
+    <last>Flaherty</last>
+  </name>
+  <name>
+    <first>Robert</first>
     <last>Shaw</last>
   </name>
   <name>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java?rev=698943&r1=698942&r2=698943&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java Thu Sep 25 05:26:31 2008
@@ -185,6 +185,7 @@
             }
 
             AntClassLoader acl = (AntClassLoader) obj;
+            boolean existingLoader = acl != null;
 
             if (acl == null) {
                 // Construct a new class loader
@@ -220,7 +221,8 @@
                     getProject().setCoreLoader(acl);
                 }
             }
-            if (classpath != null) {
+
+            if (existingLoader && classpath != null) {
                 String[] list = classpath.list();
                 for (int i = 0; i < list.length; i++) {
                     File f = new File(list[i]);