diff --git a/pom.xml b/pom.xml index 902f0424..83edf9dc 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ com.fasterxml.jackson.core jackson-core - 2.5.3 + 2.9.10 com.fasterxml.jackson.core @@ -155,7 +155,7 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.5.1 + 2.9.10 diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index ebe80573..9e9357a0 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -232,11 +232,21 @@ private void fetch() { } try { + HttpURLConnection connection = setupConnection(url); + String totalPages = connection.getHeaderField("X-Total-Pages"); + String currentPage = connection.getHeaderField("X-Page"); + try { next = parse(connection, type, null); assert next != null; - findNextUrl(); + + if(totalPages != null && totalPages.equals(currentPage)) { + url = null; + } else { + findNextUrl(); + } + } catch (IOException e) { handleAPIError(e, connection); }