[jboss-svn-commits] JBL Code SVN: r36557 - labs/jbossrules/soa_branches/BRMS-5.1-GA_BRMS-538/drools-core/src/main/java/org/drools/reteoo.

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

Author: tsurdilovic
Date: 2011-01-19 15:38:59 -0500 (Wed, 19 Jan 2011)
New Revision: 36557

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1-GA_BRMS-538/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
Log:
BRMS-538 : Fix for BRMS-519

Modified: labs/jbossrules/soa_branches/BRMS-5.1-GA_BRMS-538/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1-GA_BRMS-538/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2011-01-19 20:38:43 UTC (rev 36556)
+++ labs/jbossrules/soa_branches/BRMS-5.1-GA_BRMS-538/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2011-01-19 20:38:59 UTC (rev 36557)
@@ -241,15 +241,11 @@
                                                                 workingMemory,
                                                                 true );
                         } else {
-                            // preserve the current LeftTuple, as we need to iterate to the next before re-adding
-                            LeftTuple temp = childLeftTuple;
                             childLeftTuple = this.sink.propagateModifyChildLeftTuple( childLeftTuple,
                                                                                       leftTuple,
                                                                                       context,
                                                                                       workingMemory,
                                                                                       true );
-                            // we must re-add this to ensure deterministic iteration
-                            temp.reAddLeft();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getLeftParent() == leftTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,
@@ -329,15 +325,11 @@
                                                                 workingMemory,
                                                                 true );
                         } else {
-                            // preserve the current LeftTuple, as we need to iterate to the next before re-adding
-                            LeftTuple temp = childLeftTuple;
                             childLeftTuple = this.sink.propagateModifyChildLeftTuple( childLeftTuple,
                                                                                       rightTuple,
                                                                                       context,
                                                                                       workingMemory,
                                                                                       true );
-                            // we must re-add this to ensure deterministic iteration
-                            temp.reAddRight();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,