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

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

Author: tirelli
Date: 2006-10-24 09:33:45 -0400 (Tue, 24 Oct 2006)
New Revision: 7079

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/NotNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
Log:
Fixing integration tests

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	2006-10-24 13:26:46 UTC (rev 7078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2006-10-24 13:33:45 UTC (rev 7079)
@@ -206,7 +206,6 @@
         final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
         final ReteTuple tuple = (ReteTuple) memory.getTupleMemory().remove( leftTuple );
         if ( tuple == null ) {
-            leftTuple.release();
             return;
         }
 
@@ -221,8 +220,6 @@
                                             workingMemory );
             }
         }
-        tuple.release();
-        leftTuple.release();
     }
 
     /* (non-Javadoc)

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-10-24 13:26:46 UTC (rev 7078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-10-24 13:33:45 UTC (rev 7079)
@@ -213,7 +213,6 @@
         // Must use the tuple in memory as it has the tuple matches count
         final ReteTuple tuple = (ReteTuple) memory.getTupleMemory().remove( leftTuple );
         if ( tuple == null ) {
-            leftTuple.release();
             return;
         }
 
@@ -222,8 +221,6 @@
                                              context,
                                              workingMemory );
         }
-        tuple.release();
-        leftTuple.release();
     }
 
     /* (non-Javadoc)

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2006-10-24 13:26:46 UTC (rev 7078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteTuple.java	2006-10-24 13:33:45 UTC (rev 7079)
@@ -82,12 +82,6 @@
         return this.next;
     }
 
-    public void release() {
-        this.parent = null;
-        this.activation = null;
-        setNext( null );
-    }
-
     public boolean isFieldIndexed() {
         return this.fieldIndexed;
     }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-10-24 13:26:46 UTC (rev 7078)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java	2006-10-24 13:33:45 UTC (rev 7079)
@@ -35,7 +35,6 @@
 import org.drools.spi.PropagationContext;
 import org.drools.util.Iterator;
 import org.drools.util.TupleHashTable;
-import org.drools.util.ObjectHashMap.ObjectEntry;
 
 /**
  * Leaf Rete-OO node responsible for enacting <code>Action</code> s on a
@@ -236,9 +235,7 @@
             workingMemory.getTruthMaintenanceSystem().removeLogicalDependencies( activation,
                                                                                  context,
                                                                                  this.rule );
-            tuple.release();
         }
-        leftTuple.release();
     }
 
     public String toString() {