[jboss-svn-commits] JBL Code SVN: r19726 - 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: 2008-04-25 22:02:44 -0400 (Fri, 25 Apr 2008)
New Revision: 19726

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/InternalAgenda.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
Log:
JBRULES-1583 Heap and scheduled Activations
-ScheduledActivations should remove themselves from the linkedlist after firing.

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	2008-04-26 01:40:54 UTC (rev 19725)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2008-04-26 02:02:44 UTC (rev 19726)
@@ -201,7 +201,7 @@
     public void removeScheduleItem(final ScheduledAgendaItem item) {
         this.scheduledActivations.remove( item );
         item.cancel();
-    }
+    }    
 
     public void addAgendaGroup(final AgendaGroup agendaGroup) {
         this.agendaGroups.put( agendaGroup.getName(),
@@ -390,6 +390,10 @@
         }
         return (Activation[]) list.toArray( new Activation[list.size()] );
     }
+    
+    public org.drools.util.LinkedList getScheduledActivationsLinkedList() {
+        return this.scheduledActivations;
+    }
 
     /* (non-Javadoc)
      * @see org.drools.common.AgendaI#clearAgenda()

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalAgenda.java	2008-04-26 01:40:54 UTC (rev 19725)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalAgenda.java	2008-04-26 02:02:44 UTC (rev 19726)
@@ -13,6 +13,8 @@
     public void fireActivation(final Activation activation) throws ConsequenceException;
 
     public void removeScheduleItem(final ScheduledAgendaItem item);
+    
+    public org.drools.util.LinkedList getScheduledActivationsLinkedList();
 
     public boolean fireNextItem(AgendaFilter filter) throws ConsequenceException;
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java	2008-04-26 01:40:54 UTC (rev 19725)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java	2008-04-26 02:02:44 UTC (rev 19726)
@@ -166,6 +166,7 @@
      */
     public void run() {
         this.agenda.fireActivation( this );
+        this.agenda.getScheduledActivationsLinkedList().remove( this );
         this.agenda.getWorkingMemory().fireAllRules();
     }