[Truffle] Fix Iterator.next contract.

jruby · Jun 12, 2015 · 6d0d774 · 6d0d774
1 parent 2843c37
commit 6d0d774
Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/hash/BucketsStrategy.java b/truffle/src/main/java/org/jruby/truffle/runtime/hash/BucketsStrategy.java
@@ -210,7 +210,7 @@ public boolean hasNext() {
 
             @Override
             public Map.Entry<Object, Object> next() {
-                if (entry == null) {
+                if (!hasNext()) {
                     throw new NoSuchElementException();
                 }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/hash/PackedArrayStrategy.java b/truffle/src/main/java/org/jruby/truffle/runtime/hash/PackedArrayStrategy.java
@@ -16,6 +16,7 @@
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 public abstract class PackedArrayStrategy {
 
@@ -137,6 +138,10 @@ public boolean hasNext() {
 
             @Override
             public Map.Entry<Object, Object> next() {
+                if (!hasNext()) {
+                    throw new NoSuchElementException();
+                }
+
                 final int finalIndex = index;
 
                 final Map.Entry<Object, Object> entryResult = new Map.Entry<Object, Object>() {