summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--java/net/URLClassLoader.java7
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bd792e9d6..54c8179d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-17 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-17 Stephen Crawley <crawley@dstc.edu.au>
* java/lang/ThreadGroup.java (removeThread): null the 'group' field
diff --git a/java/net/URLClassLoader.java b/java/net/URLClassLoader.java
index a8a5f05c1..9a468bf71 100644
--- a/java/net/URLClassLoader.java
+++ b/java/net/URLClassLoader.java
@@ -657,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)
@@ -693,7 +698,7 @@ public class URLClassLoader extends SecureClassLoader
{
for (int i = 0; i < newUrls.length; i++)
{
- addURL(newUrls[i]);
+ addURLImpl(newUrls[i]);
}
}