FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Jeroen Frijters 2003-07-19 17:47:56 +02:00 • committed by Michael Koch
parent 01482e6ded
commit 35a6c8736a
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -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> 2003-07-18 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c: * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c:

10
libjava/java/net/URLClassLoader.java
View file

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