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

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

Author: mark.proctor at jboss.com
Date: 2009-01-19 00:35:59 -0500 (Mon, 19 Jan 2009)
New Revision: 24774

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
Log:
JBRULES-1921 lock-on-active behaviour for root MAIN is inconsistent
-this.main was not being set on serialsation.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2009-01-19 05:07:33 UTC (rev 24773)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2009-01-19 05:35:59 UTC (rev 24774)
@@ -548,6 +548,14 @@
     public Map<String, InternalAgendaGroup> getAgendaGroupsMap() {
         return this.agendaGroups;
     }
+    
+    public InternalAgendaGroup getMainAgendaGroup() {
+        if ( this.main ==  null ) {
+            this.main = (InternalAgendaGroup) getAgendaGroup( AgendaGroup.MAIN );
+        }
+        
+        return this.main;
+    }
 
     /*
      * (non-Javadoc)
@@ -666,7 +674,7 @@
     public void clear() {
         // reset focus stack
         this.focusStack.clear();
-        this.focusStack.add( this.main );
+        this.focusStack.add( getMainAgendaGroup() );
 
         // reset scheduled activations
         if ( !this.scheduledActivations.isEmpty() ) {
@@ -1063,9 +1071,9 @@
             fireLimit = updateFireLimit( fireLimit );
             this.workingMemory.executeQueuedActions();
         }
-        if ( this.focusStack.size() == 1 && this.main.isEmpty() ) {
+        if ( this.focusStack.size() == 1 && getMainAgendaGroup().isEmpty() ) {
             // the root MAIN agenda group is empty, reset active to false, so it can receive more activations.
-            this.main.setActive( false );
+            getMainAgendaGroup().setActive( false );
         }
         return fireCount;
     }