From 8aca770e8d35da673d8eb49f99ed69d9e4077aca Mon Sep 17 00:00:00 2001
From: Jeroen Frijters <jeroen@sumatra.nl>
Date: Thu, 17 Aug 2006 07:43:55 +0000
Subject: 2006-08-17  Jeroen Frijters  <jeroen@frijters.net>

        * gnu/java/rmi/server/RMIClassLoaderImpl.java
        (loadClass): Rewritten to use getClassLoader.
        (loadProxyClass): Implemented.
        (getClassLoader): Fixed support for null or empty codebase.
        * gnu/java/rmi/server/RMIObjectInputStream.java
        (resolveClass): Use user class loader as default class loader.
        (resolveProxyClass): Delegate to RMIClassLoader.loadProxyClass.
        * gnu/javax/rmi/CORBA/UtilDelegateImpl.java
        (loadClass): Simplified and use user class loader instead of
        context class loader as default.
        * java/io/ObjectInputStream.java
        (currentLoader): Use VMStackWalker.firstNonNullClassLoader().
        * vm/reference/gnu/classpath/VMStackWalker.java
        (firstNonNullClassLoader): New method.
        * vm/reference/java/io/VMObjectInputStream.java
        (loaderAction, currentClassLoader): Removed.
---
 vm/reference/java/io/VMObjectInputStream.java | 39 ---------------------------
 1 file changed, 39 deletions(-)

(limited to 'vm/reference/java')

diff --git a/vm/reference/java/io/VMObjectInputStream.java b/vm/reference/java/io/VMObjectInputStream.java
index 5fb56fcd4..be0f8eb52 100644
--- a/vm/reference/java/io/VMObjectInputStream.java
+++ b/vm/reference/java/io/VMObjectInputStream.java
@@ -40,10 +40,7 @@ exception statement from your version. */
 package java.io;
 
 import gnu.classpath.Configuration;
-import gnu.classpath.VMStackWalker;
 import java.lang.reflect.Constructor;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 final class VMObjectInputStream
 {
@@ -55,42 +52,6 @@ final class VMObjectInputStream
       }
   }
 
-  /**
-   * PrivilegedAction needed for Class.getClassLoader()
-   */ 
-  private static PrivilegedAction loaderAction = new PrivilegedAction()
-  {
-   /**
-     * Returns the first user defined class loader on the call stack, or the
-     * context class loader of the current thread, when no non-null class loader
-     * was found.
-     */
-    public Object run()
-    {
-      Class[] ctx = VMStackWalker.getClassContext();
-
-      for (int i = 0; i < ctx.length; i++)
-        {
-          ClassLoader cl = ctx[i].getClassLoader();
-          if (cl != null)
-            return cl;
-        }
-      return Thread.currentThread().getContextClassLoader();
-    }
-    };
-
-  /**
-   * Returns the first user defined class loader on the call stack, or the
-   * context class loader of the current thread, when no non-null class loader
-   * was found.
-   * 
-   * @return the class loader
-   */
-  static ClassLoader currentClassLoader()
-  {
-    return (ClassLoader) AccessController.doPrivileged(loaderAction);
-  }
-
   /**
    * Allocates a new Object of type clazz but without running the
    * default constructor on it. It then calls the given constructor on
-- 
cgit v1.2.1