From e8ec006664fb4d9914883d9bef47e58e3f7ef781 Mon Sep 17 00:00:00 2001 From: Marin Martinic Date: Wed, 30 Nov 2016 13:45:19 +0000 Subject: [PATCH] validate page size in hasNext --- .../java/io/intercom/api/TypedDataCollectionIterator.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java b/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java index db0b1bd5..1e2530b8 100644 --- a/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java +++ b/intercom-java/src/main/java/io/intercom/api/TypedDataCollectionIterator.java @@ -18,6 +18,11 @@ public boolean hasNext() { if (rollingCollection.hasNextPage()) { rollingCollection = rollingCollection.nextPage(); pos = 0; + + if (rollingCollection.getPage().size() == 0) { + // if new page is empty + return false; + } return true; } else { return false;