Add loop for empty pages in PageImpl.iterateAll

mziccard · mziccard · commit 076127d6ce59 · 2015-11-07T23:50:45.000+01:00
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java b/gcloud-java-core/src/main/java/com/google/gcloud/PageImpl.java
@@ -50,18 +50,14 @@ static class PageIterator<T> extends AbstractIterator<T> {
 
     @Override
     protected T computeNext() {
-      if (currentPageIterator.hasNext()) {
-        return currentPageIterator.next();
-      }
-      Page<T> nextPage = currentPage.nextPage();
-      if (nextPage != null) {
-        currentPage = nextPage;
-        currentPageIterator = currentPage.values().iterator();
-        if (currentPageIterator.hasNext()) {
-          return currentPageIterator.next();
+      while (!currentPageIterator.hasNext()) {
+        currentPage = currentPage.nextPage();
+        if (currentPage == null) {
+          return endOfData();
         }
+        currentPageIterator = currentPage.values().iterator();
       }
-      return endOfData();
+      return currentPageIterator.next();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -50,18 +50,14 @@ static class PageIterator<T> extends AbstractIterator<T> {`
`50`	`50`
`51`	`51`	`@Override`
`52`	`52`	`protected T computeNext() {`
`53`		`- if (currentPageIterator.hasNext()) {`
`54`		`- return currentPageIterator.next();`
`55`		`- }`
`56`		`- Page<T> nextPage = currentPage.nextPage();`
`57`		`- if (nextPage != null) {`
`58`		`- currentPage = nextPage;`
`59`		`- currentPageIterator = currentPage.values().iterator();`
`60`		`- if (currentPageIterator.hasNext()) {`
`61`		`- return currentPageIterator.next();`
	`53`	`+ while (!currentPageIterator.hasNext()) {`
	`54`	`+ currentPage = currentPage.nextPage();`
	`55`	`+ if (currentPage == null) {`
	`56`	`+ return endOfData();`
`62`	`57`	`}`
	`58`	`+ currentPageIterator = currentPage.values().iterator();`
`63`	`59`	`}`
`64`		`- return endOfData();`
	`60`	`+ return currentPageIterator.next();`
`65`	`61`	`}`
`66`	`62`	`}`
`67`	`63`