[jboss-svn-commits] JBL Code SVN: r6731 - labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/reteoo

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

Author: tirelli
Date: 2006-10-10 14:56:36 -0400 (Tue, 10 Oct 2006)
New Revision: 6731

Modified:
   labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
Log:
JBRULES-506: fixing a modify issue when using noloop

Modified: labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
===================================================================
--- labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-10-10 18:54:45 UTC (rev 6730)
+++ labs/jbossrules/branches/3.0.x/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-10-10 18:56:36 UTC (rev 6731)
@@ -19,9 +19,7 @@
 import java.io.Serializable;
 import java.util.Iterator;
 
-import org.drools.Agenda;
 import org.drools.RuleBaseConfiguration;
-import org.drools.common.DefaultAgenda;
 import org.drools.common.AgendaGroupImpl;
 import org.drools.common.AgendaItem;
 import org.drools.common.InternalAgenda;
@@ -234,7 +232,7 @@
         boolean fireActivation = true;
         Activation activation = tuple.getActivation();
         
-        if ( activation.isActivated() ) {
+        if ( ( activation != null ) && ( activation.isActivated() ) ) {
             activation.remove();
             fireActivation = false;
         }