fixed issue #20

PagedIterator is updated to cope with the base iterator returning array of length 0
hub4j · Sep 13, 2012 · 2e74517 · 2e74517
1 parent aed8880
commit 2e74517
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/main/java/org/kohsuke/github/PagedIterator.java b/src/main/java/org/kohsuke/github/PagedIterator.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 
 /**
  * Iterator over a pagenated data source.
@@ -28,17 +29,24 @@ public abstract class PagedIterator<T> implements Iterator<T> {
     protected abstract void wrapUp(T[] page);
 
     public boolean hasNext() {
-        return (current!=null && pos<current.length) || base.hasNext();
+        fetch();
+        return current!=null;
     }
 
     public T next() {
         fetch();
-
+        if (current==null)  throw new NoSuchElementException();
         return current[pos++];
     }
 
     private void fetch() {
         while (current==null || current.length<=pos) {
+            if (!base.hasNext()) {// no more to retrieve
+                current = null;
+                pos = 0;
+                return;
+            }
+
             current = base.next();
             wrapUp(current);
             pos = 0;

diff --git a/src/test/java/org/kohsuke/AppTest.java b/src/test/java/org/kohsuke/AppTest.java
@@ -12,6 +12,7 @@
 import org.kohsuke.github.GHHook;
 import org.kohsuke.github.GHBranch;
 import org.kohsuke.github.GHIssue;
+import org.kohsuke.github.GHIssueComment;
 import org.kohsuke.github.GHIssueState;
 import org.kohsuke.github.GHKey;
 import org.kohsuke.github.GHMyself;
@@ -51,6 +52,17 @@ public void testCredentialValid() throws IOException {
         assertFalse(GitHub.connect("totally", "bogus").isCredentialValid());
     }
 
+    public void testIssueWithNoComment() throws IOException {
+        GHRepository repository = GitHub.connect().getRepository("kohsuke/github-api");
+        List<GHIssueComment> v = repository.getIssue(13).getComments();
+        System.out.println(v);
+        assertTrue(v.isEmpty());
+
+        v = repository.getIssue(5).getComments();
+        System.out.println(v);
+        assertTrue(v.size()==3);
+    }
+
     public void testRateLimit() throws IOException {
         System.out.println(GitHub.connect().getRateLimit());
     }