[jboss-svn-commits] JBL Code SVN: r19200 - 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: 2008-03-21 20:35:33 -0400 (Fri, 21 Mar 2008)
New Revision: 19200

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
Log:
JBRULES-1520 RightTuple merge for asynchronous Rete propagations
-Fixed EvalConditionNode

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java	2008-03-21 23:50:09 UTC (rev 19199)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java	2008-03-22 00:35:33 UTC (rev 19200)
@@ -162,45 +162,42 @@
     /**
      * Assert a new <code>Tuple</code>.
      *
-     * @param tuple
+     * @param leftTuple
      *            The <code>Tuple</code> being asserted.
      * @param workingMemory
      *            The working memory seesion.
      * @throws AssertionException
      *             If an error occurs while asserting.
      */
-    public void assertLeftTuple(final LeftTuple tuple,
+    public void assertLeftTuple(final LeftTuple leftTuple,
                                 final PropagationContext context,
                                 final InternalWorkingMemory workingMemory) {
         final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( this );
 
-        final boolean allowed = this.condition.isAllowed( tuple,
+        final boolean allowed = this.condition.isAllowed( leftTuple,
                                                           workingMemory,
                                                           memory.context );
 
         if ( allowed ) {
             if ( this.tupleMemoryEnabled ) {
-                memory.tupleMemory.add( tuple );
+                memory.tupleMemory.add( leftTuple );
             }
 
-            this.sink.propagateAssertLeftTuple( tuple,
+            this.sink.propagateAssertLeftTuple( leftTuple,
                                                 context,
                                                 workingMemory );
         }
     }
 
-    public void retractLeftTuple(final LeftTuple tuple,
+    public void retractLeftTuple(final LeftTuple leftTuple,
                                  final PropagationContext context,
                                  final InternalWorkingMemory workingMemory) {
         final EvalMemory memory = (EvalMemory) workingMemory.getNodeMemory( this );
 
-        // can we improve that?
-        final LeftTuple memTuple = memory.tupleMemory.remove( tuple );
-        if ( memTuple != null ) {
-            this.sink.propagateRetractLeftTuple( memTuple,
-                                                 context,
-                                                 workingMemory );
-        }
+        memory.tupleMemory.remove( leftTuple );
+        this.sink.propagateRetractLeftTuple( leftTuple,
+                                             context,
+                                             workingMemory );
     }
 
     /**
@@ -323,7 +320,7 @@
 
         private static final long serialVersionUID = -2754669682742843929L;
 
-        public LeftTupleList     tupleMemory;
+        public LeftTupleList      tupleMemory;
         public Object             context;
 
         public EvalMemory() {