[jboss-svn-commits] JBL Code SVN: r10873 - 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 19:26:17 -0400 (Tue, 10 Apr 2007)
New Revision: 10873

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 context.getActivationOrigin().getTuple().equals( tuple ) to the no-loop check

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-10 23:26:14 UTC (rev 10872)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java	2007-04-10 23:26:17 UTC (rev 10873)
@@ -139,10 +139,10 @@
         //check if the rule is effective
         if ( !this.rule.isEffective() ) {
             return;
-        }
-
-        // if the current Rule is no-loop and the origin rule is the same then return
-        if ( this.rule.getNoLoop() && this.rule.equals( context.getRuleOrigin() ) ) {
+        }        
+        
+        // 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 ) ) {
             return;
         }