The patch below should fix bug 22041
(http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22041). As it involves class
loaders, a subject I still don't feel 100% confident about, I would be grateful
for any comments before I commit it.

Thanks,

Mark

Index: catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/Cu
stomObjectInputStream.java,v
retrieving revision 1.3
diff -u -r1.3 CustomObjectInputStream.java
--- catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
27 Feb 2004 14:58:50 -0000      1.3
+++ catalina/src/share/org/apache/catalina/util/CustomObjectInputStream.java
16 May 2004 13:35:18 -0000
@@ -72,5 +72,27 @@
         return Class.forName(classDesc.getName(), false, classLoader);
     }

+    /**
+     * Return a proxy class that implements the interfaces named in a proxy
+     * class descriptor. Do this using the class loader assigned to this
+     * Context.
+     */
+    protected Class resolveProxyClass(String[] interfaces)
+        throws IOException, ClassNotFoundException {
+
+        ClassLoader originalClassLoader =
+            Thread.currentThread().getContextClassLoader();
+
+        // Set thread to use context class loader
+        Thread.currentThread().setContextClassLoader(classLoader);
+
+        // Use super class to do all the real work
+        Class clazz = super.resolveProxyClass(interfaces);
+
+        // Swap back to original class loader
+        Thread.currentThread().setContextClassLoader(originalClassLoader);
+
+        return clazz;
+    }

 } 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to