2006-01-27 Audrius Meskauskas <AudriusA@Bioinformatics.org>

	PR 25520
	* vm/reference/java/io/VMObjectInputStream.java (loaderAction.run):
	If no user class loaders found on the stack, return the thread
	context class loader. (currentClassLoader): Explained.

2 files changed, 32 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f2b039f2..74e361941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-27  Audrius Meskauskas  <AudriusA@Bioinformatics.org>
+
+	PR 25520
+	* vm/reference/java/io/VMObjectInputStream.java (loaderAction.run):
+	If no user class loaders found on the stack, return the thread 
+	context class loader. (currentClassLoader): Explained.
+
 2006-01-27  Roman Kennke  <kennke@aicas.com>
 
 	* java/awt/Container.java
diff --git a/vm/reference/java/io/VMObjectInputStream.java b/vm/reference/java/io/VMObjectInputStream.java
index 93a42b1ca..5fb56fcd4 100644
--- a/vm/reference/java/io/VMObjectInputStream.java
+++ b/vm/reference/java/io/VMObjectInputStream.java
@@ -55,25 +55,36 @@ final class VMObjectInputStream
       }
   }
 
-  // PrivilegedAction needed for Class.getClassLoader()
+  /**
+   * 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()
     {
-      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 null;
-      }
+      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
-   * null when no non-null class loader was found.
+   * 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()
   {