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

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

Author: tirelli
Date: 2010-03-29 21:08:28 -0400 (Mon, 29 Mar 2010)
New Revision: 32292

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:
JBRULES-2339: JBRULES-2340: fixing memory leak

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-03-29 23:53:13 UTC (rev 32291)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AccumulateNode.java	2010-03-30 01:08:28 UTC (rev 32292)
@@ -358,7 +358,7 @@
                         } else {
                             // we must re-add this to ensure deterministic iteration
                             LeftTuple temp = childLeftTuple.getLeftParentNext();
-                            childLeftTuple.reAddLeft();
+                            childLeftTuple.reAddRight();
                             childLeftTuple = temp;
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
@@ -468,7 +468,7 @@
                         final AccumulateContext accctx = (AccumulateContext) memory.betaMemory.getCreatedHandles().get( leftTuple );
                         if ( childLeftTuple == null || childLeftTuple.getLeftParent() == leftTuple ) {
                             // we must re-add this to ensure deterministic iteration
-                            childLeftTuple.reAddRight();
+                            childLeftTuple.reAddLeft();
                             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-03-29 23:53:13 UTC (rev 32291)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2010-03-30 01:08:28 UTC (rev 32292)
@@ -375,7 +375,7 @@
                         } else {
                             // we must re-add this to ensure deterministic iteration
                             LeftTuple temp = childLeftTuple.getLeftParentNext();
-                            childLeftTuple.reAddLeft();
+                            childLeftTuple.reAddRight();
                             childLeftTuple = temp;
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
@@ -469,7 +469,7 @@
                         final CollectContext colctx = (CollectContext) memory.betaMemory.getCreatedHandles().get( leftTuple );
                         if ( childLeftTuple == null || childLeftTuple.getLeftParent() == leftTuple ) {
                             // we must re-add this to ensure deterministic iteration
-                            childLeftTuple.reAddRight();
+                            childLeftTuple.reAddLeft();
                             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-03-29 23:53:13 UTC (rev 32291)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2010-03-30 01:08:28 UTC (rev 32292)
@@ -224,7 +224,7 @@
                                                                                       workingMemory,
                                                                                       this.tupleMemoryEnabled );
                             // we must re-add this to ensure deterministic iteration
-                            temp.reAddRight();
+                            temp.reAddLeft();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getLeftParent() == leftTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,
@@ -307,7 +307,7 @@
                                                                                       workingMemory,
                                                                                       this.tupleMemoryEnabled );
                             // we must re-add this to ensure deterministic iteration
-                            temp.reAddLeft();
+                            temp.reAddRight();
                         }
                     } else if ( childLeftTuple != null && childLeftTuple.getRightParent() == rightTuple ) {
                         childLeftTuple = this.sink.propagateRetractChildLeftTuple( childLeftTuple,