URLClassLoader.java (addURL): Moved implementation to private addURLImpl() to…

URLClassLoader.java (addURL): Moved implementation to private addURLImpl() to avoid calling addURL from the...

2003-07-19  Jeroen Frijters <jeroen@sumatra.nl>

	* java/net/URLClassLoader.java (addURL): Moved implementation to
	private addURLImpl() to avoid calling addURL from the constructor.
	(addURLImpl): Contains the code that was previously in addURL.
	(addURLs): Call addURLImpl(), not addURL().

From-SVN: r69591

libjava/ChangeLog

+2003-07-19  Jeroen Frijters <jeroen@sumatra.nl>
+
+	* java/net/URLClassLoader.java (addURL): Moved implementation to
+	private addURLImpl() to avoid calling addURL from the constructor.
+	(addURLImpl): Contains the code that was previously in addURL.
+	(addURLs): Call addURLImpl(), not addURL().
+
 2003-07-18  Graydon Hoare  <graydon@redhat.com>
 
 	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c: 

libjava/java/net/URLClassLoader.java

@@ -311,6 +311,9 @@ public class URLClassLoader extends SecureClassLoader
       if (jarfile == null)
 	return null;
 
+      if (name.startsWith("/"))
+        name = name.substring(1);
+
       JarEntry je = jarfile.getJarEntry(name);
       if(je != null)
 	return new JarURLResource(this, name, je);
@@ -654,6 +657,11 @@ public class URLClassLoader extends SecureClassLoader
    */
   protected void addURL(URL newUrl)
   {
+    addURLImpl(newUrl);
+  }
+
+  private void addURLImpl(URL newUrl)
+  {
     synchronized(urlloaders)
       {
 	if (newUrl == null)
@@ -690,7 +698,7 @@ public class URLClassLoader extends SecureClassLoader
   {
     for (int i = 0; i < newUrls.length; i++)
     {
-      addURL(newUrls[i]);
+      addURLImpl(newUrls[i]);
     }
   }