[jboss-svn-commits] JBL Code SVN: r8537 - in labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools: common rule

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2006-12-22 08:21:10 -0500 (Fri, 22 Dec 2006)
New Revision: 8537

Modified:
   labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/ObjectInputStreamWithLoader.java
   labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/CompositePackageClassLoader.java
Log:
JBRULES-592: fixing problem with working memory serialization/deserialization

Modified: labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/ObjectInputStreamWithLoader.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/ObjectInputStreamWithLoader.java	2006-12-22 12:00:33 UTC (rev 8536)
+++ labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/common/ObjectInputStreamWithLoader.java	2006-12-22 13:21:10 UTC (rev 8537)
@@ -20,11 +20,16 @@
 
     protected Class resolveClass(final ObjectStreamClass desc) throws IOException,
                                                               ClassNotFoundException {
+        
         if ( this.classLoader == null ) {
             return super.resolveClass( desc );
         } else {
             final String name = desc.getName();
-            return this.classLoader.loadClass( name );
+            try{
+                return this.classLoader.loadClass( name );
+            } catch (ClassNotFoundException cnf) {
+                return super.resolveClass( desc );
+            }
         }
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/CompositePackageClassLoader.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/CompositePackageClassLoader.java	2006-12-22 12:00:33 UTC (rev 8536)
+++ labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/rule/CompositePackageClassLoader.java	2006-12-22 13:21:10 UTC (rev 8537)
@@ -47,6 +47,7 @@
      */
     protected synchronized Class loadClass(final String name,
                                            final boolean resolve) throws ClassNotFoundException {
+
         Class clazz = findLoadedClass( name );
 
         if ( clazz == null ) {