json-iterator#40 fix iterator tail

taowen · taowen · commit a6d64e745f65 · 2017-04-01T20:22:27.000+08:00
diff --git a/src/main/java/com/jsoniter/any/ArrayLazyAny.java b/src/main/java/com/jsoniter/any/ArrayLazyAny.java
@@ -202,9 +202,16 @@ public boolean hasNext() {
 
         @Override
         public Any next() {
+            if (next == null) {
+                throw new IndexOutOfBoundsException();
+            }
             Any current = next;
-            index++;
-            next = fillCacheUntil(index);
+            try {
+                index++;
+                next = fillCacheUntil(index);
+            } catch (IndexOutOfBoundsException e){
+                next = null;
+            }
             return current;
         }
     }
diff --git a/src/test/java/com/jsoniter/any/TestArray.java b/src/test/java/com/jsoniter/any/TestArray.java
@@ -60,5 +60,7 @@ public void test_fill_partial_then_iterate() {
         Iterator<Any> iter = obj.iterator();
         assertEquals(1, iter.next().toInt());
         assertEquals(2, iter.next().toInt());
+        assertEquals(3, iter.next().toInt());
+        assertFalse(iter.hasNext());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,7 @@ public void test_fill_partial_then_iterate() {`
`60`	`60`	`Iterator<Any> iter = obj.iterator();`
`61`	`61`	`assertEquals(1, iter.next().toInt());`
`62`	`62`	`assertEquals(2, iter.next().toInt());`
	`63`	`+ assertEquals(3, iter.next().toInt());`
	`64`	`+ assertFalse(iter.hasNext());`
`63`	`65`	`}`
`64`	`66`	`}`