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

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

Author: tirelli
Date: 2006-10-06 19:32:59 -0400 (Fri, 06 Oct 2006)
New Revision: 6670

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/FieldIndexHashTable.java
Log:
JBRULES-498: fixing NPE

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/FieldIndexHashTable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/FieldIndexHashTable.java	2006-10-06 22:46:17 UTC (rev 6669)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/FieldIndexHashTable.java	2006-10-06 23:32:59 UTC (rev 6670)
@@ -58,7 +58,7 @@
             this.tupleValueIterator = new FieldIndexHashTableIterator();
         }
         FieldIndexEntry entry = ( FieldIndexEntry ) get( tuple );
-        this.tupleValueIterator.reset( entry.first );
+        this.tupleValueIterator.reset( (entry != null) ? entry.first : null );
         return this.tupleValueIterator;
     }
 
@@ -92,8 +92,9 @@
          * @see org.drools.util.Iterator#next()
          */
         public Entry next() {
-            this.entry = this.entry.getNext();
-            return this.entry;
+            Entry current = this.entry; 
+            this.entry = ( this.entry != null ) ? this.entry.getNext() : null;
+            return current;
         }
 
         /* (non-Javadoc)