[jboss-svn-commits] JBL Code SVN: r17688 - in labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools: common and 1 other directories.

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

Author: fmeyer
Date: 2008-01-10 14:09:05 -0500 (Thu, 10 Jan 2008)
New Revision: 17688

Modified:
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
   labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
Log:
SOA-315 KnowledgeHelper should have cache reset before use. JBRULES-1413


Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java	2008-01-10 19:05:34 UTC (rev 17687)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java	2008-01-10 19:09:05 UTC (rev 17688)
@@ -49,6 +49,13 @@
         this.activation = agendaItem;
         this.tuple = agendaItem.getTuple();
     }
+    
+    public void reset() {
+        this.rule = null;
+        this.subrule = null;
+        this.activation = null;
+        this.tuple = null;
+    }
 
     public void insert(final Object object) throws FactException {
         insert( object,

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java	2008-01-10 19:05:34 UTC (rev 17687)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java	2008-01-10 19:09:05 UTC (rev 17688)
@@ -53,6 +53,14 @@
         this.activation = agendaItem;
         this.tuple = agendaItem.getTuple();
     }
+    
+    public void reset() {
+        this.rule = null;
+        this.subrule = null;
+        this.activation = null;
+        this.tuple = null;
+    }
+    
 
     public void insert(final Object object) throws FactException {        
     }

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2008-01-10 19:05:34 UTC (rev 17687)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/common/DefaultAgenda.java	2008-01-10 19:09:05 UTC (rev 17688)
@@ -549,6 +549,7 @@
             this.knowledgeHelper.setActivation( activation );
             activation.getRule().getConsequence().evaluate( this.knowledgeHelper,
                                                             this.workingMemory );
+            this.knowledgeHelper.reset();
         } catch ( final Exception e ) {
             this.consequenceExceptionHandler.handleException( activation, this.workingMemory, e );
         }

Modified: labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java	2008-01-10 19:05:34 UTC (rev 17687)
+++ labs/jbossrules/branches/Branch_4_0_2_SOA_4_2/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java	2008-01-10 19:09:05 UTC (rev 17688)
@@ -43,6 +43,9 @@
     
     public void setActivation(final Activation agendaItem); 
     
+    public void reset();
+    
+    
     /**
      * Asserts an object, notice that it does not return the FactHandle
      *