diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-19 15:47:56 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-07-19 15:47:56 +0000 |
| commit | 57b6b3b05dc1eb20bf08503f2e046dfcc50bc14c (patch) | |
| tree | 7f896d9cf996acf8b20cd46f74bc4781e0b2f668 /libjava | |
| parent | 10a02841235ea209a9006ec6c8c1287a6d721ad7 (diff) | |
| download | ppe42-gcc-57b6b3b05dc1eb20bf08503f2e046dfcc50bc14c.tar.gz ppe42-gcc-57b6b3b05dc1eb20bf08503f2e046dfcc50bc14c.zip | |
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().
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69591 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/net/URLClassLoader.java | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 94cb464fcf8..e7c86ed7ff2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +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: diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java index 10b67352f04..9a468bf71af 100644 --- a/libjava/java/net/URLClassLoader.java +++ b/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]); } } |
