[jboss-svn-commits] JBL Code SVN: r14675 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo.

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

Author: mark.proctor at jboss.com
Date: 2007-08-27 19:28:38 -0400 (Mon, 27 Aug 2007)
New Revision: 14675

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
Log:
JBRULES-1137 Rules are not removed when they have shared nodes
-updated for query
-RuleTerminalNode now clears wm memory too

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java	2007-08-27 23:12:32 UTC (rev 14674)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java	2007-08-27 23:28:38 UTC (rev 14675)
@@ -153,6 +153,9 @@
         for ( int i = 0, length = workingMemories.length; i < length; i++ ) {
             workingMemories[i].clearNodeMemory( this );
         }
+        
+        removeShare();
+        
         this.tupleSource.remove( this,
                                  workingMemories );
     }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2007-08-27 23:12:32 UTC (rev 14674)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2007-08-27 23:28:38 UTC (rev 14675)
@@ -449,10 +449,11 @@
                                                                                           null );
                 workingMemory.getTruthMaintenanceSystem().removeLogicalDependencies( activation,
                                                                                      propagationContext,
-                                                                                     this.rule );
+                                                                                     this.rule );                                
             }
 
             workingMemory.executeQueuedActions();
+            workingMemory.clearNodeMemory( this );
         }
 
         removeShare();