[jboss-svn-commits] JBL Code SVN: r12847 - in labs/jbossrules/trunk/drools-core: src/main/java/org/drools/base and 2 other directories.

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

Author: mark.proctor at jboss.com
Date: 2007-06-25 21:31:25 -0400 (Mon, 25 Jun 2007)
New Revision: 12847

Modified:
   labs/jbossrules/trunk/drools-core/.classpath
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassTypeResolver.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java
Log:
JBRULES-945 ActivationGroup not serializable

Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath	2007-06-26 01:12:42 UTC (rev 12846)
+++ labs/jbossrules/trunk/drools-core/.classpath	2007-06-26 01:31:25 UTC (rev 12847)
@@ -6,7 +6,7 @@
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta26/mvel14-1.2beta26.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta27/mvel14-1.2beta27.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassTypeResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassTypeResolver.java	2007-06-26 01:12:42 UTC (rev 12846)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassTypeResolver.java	2007-06-26 01:31:25 UTC (rev 12847)
@@ -221,7 +221,6 @@
         String qualifiedClass = null;
         Class clazz = null;
 
-        // not python
         if ( importText.endsWith( "*" ) ) {
             qualifiedClass = importText.substring( 0,
                                                    importText.indexOf( '*' ) ) + className;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java	2007-06-26 01:12:42 UTC (rev 12846)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java	2007-06-26 01:31:25 UTC (rev 12847)
@@ -151,8 +151,10 @@
             return;
         }
 
-        memory.add( handle,
-                    false );
+        if ( hasMemory() ) {
+            memory.add( handle,
+                        false );
+        }
 
         this.sink.propagateAssertObject( handle,
                                          context,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java	2007-06-26 01:12:42 UTC (rev 12846)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java	2007-06-26 01:31:25 UTC (rev 12847)
@@ -1,8 +1,11 @@
 package org.drools.spi;
 
+import java.io.Serializable;
 import java.util.Iterator;
 
-public interface ActivationGroup {
+public interface ActivationGroup
+    extends
+    Serializable {
     public String getName();
 
     public void addActivation(Activation activation);