Fix paged list to use hasNextPage() for hasNext()

xingwu1 · Apr 15, 2016 · ea61512 · ea61512
1 parent 4ff082d
commit ea61512
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java b/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java
@@ -130,7 +130,7 @@ public ListItr(int index) {
 
         @Override
         public boolean hasNext() {
-            return itemsListItr.hasNext() || nextPageLink != null;
+            return itemsListItr.hasNext() || hasNextPage();
         }
 
         @Override
@@ -191,7 +191,7 @@ public int size() {
 
     @Override
     public boolean isEmpty() {
-        return items.isEmpty() && nextPageLink == null;
+        return items.isEmpty() && !hasNextPage();
     }
 
     @Override