You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by bo...@apache.org on 2008/01/30 20:39:41 UTC

svn commit: r616857 - /ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java

Author: boisvert
Date: Wed Jan 30 11:39:39 2008
New Revision: 616857

URL: http://svn.apache.org/viewvc?rev=616857&view=rev
Log:
Fix ODE-237: ClassNotFoundException while deserializing HBpelEvent in Geronimo MultiParentClassLoader

Modified:
    ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java

Modified: ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java?rev=616857&r1=616856&r2=616857&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java (original)
+++ ode/branches/APACHE_ODE_1.1/utils/src/main/java/org/apache/ode/utils/SerializableUtils.java Wed Jan 30 11:39:39 2008
@@ -81,11 +81,13 @@
     try {
       ObjectInputStream ois = new ObjectInputStream(binaryStream) {
 
-        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException,
-            ClassNotFoundException {
+        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
           String name = desc.getName();
-          Class c = cl.loadClass(name);
-          return c;
+          try {
+              return Class.forName(name, true, cl);
+          } catch (ClassNotFoundException ex) {
+              return super.resolveClass(desc);
+          }
         }
       };
       return ois.readObject();