[jboss-svn-commits] JBL Code SVN: r10878 - 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-04-10 20:25:18 -0400 (Tue, 10 Apr 2007)
New Revision: 10878

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
Log:
JBRULES-787 no-loop blocks all dependant tuples for modify
-Added slightly different behaviour for retract/assert than to modify

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-04-11 00:01:39 UTC (rev 10877)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2007-04-11 00:25:18 UTC (rev 10878)
@@ -142,7 +142,11 @@
         }        
         
         // if the current Rule is no-loop and the origin rule is the same and its the same set of facts (tuple) then return
-        if ( context.getType() == PropagationContext.MODIFICATION && this.rule.getNoLoop() && this.rule.equals( context.getRuleOrigin() ) && context.getActivationOrigin().getTuple().equals( tuple ) ) {
+        if ( context.getType() == PropagationContext.MODIFICATION ) {
+            if ( this.rule.getNoLoop() && this.rule.equals( context.getRuleOrigin() ) && context.getActivationOrigin().getTuple().equals( tuple ) ) {
+                return;
+            }
+        } else if ( this.rule.getNoLoop() && this.rule.equals( context.getRuleOrigin() ) ) {
             return;
         }