Merge pull request #713 from gitlab4j/issue-658

Fix #658 : Pager not working properly
gitlab4j · Jun 7, 2021 · 69c15a3 · 69c15a3
2 parents db8f925 + 4e9f7a6
commit 69c15a3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/org/gitlab4j/api/Pager.java b/src/main/java/org/gitlab4j/api/Pager.java
@@ -306,12 +306,6 @@ public List<T> current() throws GitLabApiException {
      */
     public List<T> page(int pageNumber) {
 
-        if (pageNumber > totalPages && pageNumber > kaminariNextPage) {
-            throw new NoSuchElementException();
-        } else if (pageNumber < 1) {
-            throw new NoSuchElementException();
-        }
-
         if (currentPage == 0 && pageNumber == 1) {
             currentPage = 1;
             return (currentItems);
@@ -321,6 +315,12 @@ public List<T> page(int pageNumber) {
             return (currentItems);
         }
 
+        if (pageNumber > totalPages && pageNumber > kaminariNextPage) {
+            throw new NoSuchElementException();
+        } else if (pageNumber < 1) {
+            throw new NoSuchElementException();
+        }
+
         try {
 
             setPageParam(pageNumber);