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

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

Author: tirelli
Date: 2010-04-01 19:23:23 -0400 (Thu, 01 Apr 2010)
New Revision: 32365

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
Log:
Fixing tests

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2010-04-01 22:24:43 UTC (rev 32364)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2010-04-01 23:23:23 UTC (rev 32365)
@@ -359,6 +359,7 @@
                             // we must re-add this to ensure deterministic iteration
                             LeftTuple temp = childLeftTuple.getLeftParentNext();
                             childLeftTuple.reAddRight();
+                            childLeftTuple.reAddLeft();
                             childLeftTuple = temp;
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
@@ -469,6 +470,7 @@
                         if ( childLeftTuple == null || childLeftTuple.getLeftParent() == leftTuple ) {
                             // we must re-add this to ensure deterministic iteration
                             childLeftTuple.reAddLeft();
+                            childLeftTuple.reAddRight();
                             removeMatch( rightTuple,
                                          childLeftTuple,
                                          workingMemory,

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-04-01 22:24:43 UTC (rev 32364)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-04-01 23:23:23 UTC (rev 32365)
@@ -376,6 +376,7 @@
                             // we must re-add this to ensure deterministic iteration
                             LeftTuple temp = childLeftTuple.getLeftParentNext();
                             childLeftTuple.reAddRight();
+                            childLeftTuple.reAddLeft();
                             childLeftTuple = temp;
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
@@ -470,6 +471,7 @@
                         if ( childLeftTuple == null || childLeftTuple.getLeftParent() == leftTuple ) {
                             // we must re-add this to ensure deterministic iteration
                             childLeftTuple.reAddLeft();
+                            childLeftTuple.reAddRight();
                             removeMatch( rightTuple,
                                          childLeftTuple,
                                          colctx );

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2010-04-01 22:24:43 UTC (rev 32364)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2010-04-01 23:23:23 UTC (rev 32365)
@@ -225,6 +225,7 @@
                                                                                       this.tupleMemoryEnabled );
                             // we must re-add this to ensure deterministic iteration
                             temp.reAddLeft();
+                            temp.reAddRight();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getLeftParent() == leftTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,
@@ -308,6 +309,7 @@
                                                                                       this.tupleMemoryEnabled );
                             // we must re-add this to ensure deterministic iteration
                             temp.reAddRight();
+                            temp.reAddLeft();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,