2005-10-21 Jeroen Frijters <jeroen@frijters.net>

        * java/lang/reflect/Proxy.java
        (ProxyType.ProxyType): Don't replace null with system class loader.
        (ProxyType.hashCode): Handle null loader.

1 files changed, 1 insertions, 4 deletions

diff --git a/java/lang/reflect/Proxy.java b/java/lang/reflect/Proxy.java
index 325f79375..137cb5a48 100644
--- a/java/lang/reflect/Proxy.java
+++ b/java/lang/reflect/Proxy.java
@@ -413,8 +413,6 @@ public class Proxy implements Serializable
      */
     ProxyType(ClassLoader loader, Class[] interfaces)
     {
-      if (loader == null)
-         loader = ClassLoader.getSystemClassLoader();
       this.loader = loader;
       this.interfaces = interfaces;
     }
@@ -426,8 +424,7 @@ public class Proxy implements Serializable
      */
     public int hashCode()
     {
-      //loader is always not null
-      int hash = loader.hashCode();
+      int hash = loader == null ? 0 : loader.hashCode();
       for (int i = 0; i < interfaces.length; i++)
         hash = hash * 31 + interfaces[i].hashCode();
       return hash;