fixed page listing for no item lists.

jianghaolu · Sep 2, 2016 · a55439f · a55439f
1 parent e132607
commit a55439f
Showing 1 changed file with 9 additions and 3 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
@@ -47,7 +47,10 @@ public PagedList() {
      */
     public PagedList(Page<E> page) {
         this();
-        items.addAll(page.getItems());
+        List<E> retrievedItems = page.getItems();
+        if (retrievedItems != null && retrievedItems.size() != 0) {
+            items.addAll(retrievedItems);
+        }
         nextPageLink = page.getNextPageLink();
         currentPage = page;
     }
@@ -138,14 +141,17 @@ public boolean hasNext() {
         public E next() {
             if (!itemsListItr.hasNext()) {
                 if (!hasNextPage()) {
-                    throw new NoSuchElementException();
+                    throw new NoSuchElementException();                        
                 } else {
                     int size = items.size();
                     loadNextPage();
                     itemsListItr = items.listIterator(size);
                 }
             }
-            return itemsListItr.next();
+            if (itemsListItr.hasNext()) {
+                return itemsListItr.next();
+            }
+            return null;
         }
 
         @Override