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

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

Author: tirelli
Date: 2006-10-20 18:52:51 -0400 (Fri, 20 Oct 2006)
New Revision: 6994

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java
Log:
JBRULES-527: fixing compilation problems

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java	2006-10-20 22:47:27 UTC (rev 6993)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaMemory.java	2006-10-20 22:52:51 UTC (rev 6994)
@@ -1,14 +1,12 @@
 package org.drools.reteoo;
 
-import java.util.HashMap;
-import java.util.Map;
-
+import org.drools.util.ObjectHashMap;
 import org.drools.util.TupleHashTable;
 
 public class BetaMemory {
     private TupleHashTable  tupleMemory;
     private ObjectHashTable objectMemory;
-    private Map         createdHandles;
+    private ObjectHashMap   createdHandles;
 
     public BetaMemory(final TupleHashTable tupleMemory,
                       final ObjectHashTable objectMemory) {
@@ -24,9 +22,9 @@
         return this.tupleMemory;
     }
     
-    public Map getCreatedHandles() {
+    public ObjectHashMap getCreatedHandles() {
         if(createdHandles == null) {
-            createdHandles = new HashMap();
+            createdHandles = new ObjectHashMap();
         }
         return createdHandles;
     }

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	2006-10-20 22:47:27 UTC (rev 6993)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CollectNode.java	2006-10-20 22:52:51 UTC (rev 6994)
@@ -17,7 +17,6 @@
 package org.drools.reteoo;
 
 import java.util.Collection;
-import java.util.Map;
 
 import org.drools.common.BetaConstraints;
 import org.drools.common.EmptyBetaConstraints;
@@ -28,6 +27,7 @@
 import org.drools.spi.PropagationContext;
 import org.drools.util.Iterator;
 import org.drools.util.AbstractHashTable.FactEntry;
+import org.drools.util.ObjectHashMap.ObjectEntry;
 
 /**
  * @author etirelli
@@ -252,9 +252,10 @@
                            PropagationContext context,
                            InternalWorkingMemory workingMemory) {
         final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
+        
+        final Iterator it = memory.getCreatedHandles().iterator();
 
-        for ( java.util.Iterator it = memory.getCreatedHandles().entrySet().iterator(); it.hasNext(); ) {
-            Map.Entry entry = (Map.Entry) it.next();
+        for ( ObjectEntry entry = (ObjectEntry) it.next(); entry != null; entry = (ObjectEntry) it.next()) {
             sink.assertTuple( new ReteTuple( (ReteTuple)entry.getKey(),
                                              (InternalFactHandle) entry.getValue()),
                               context,