From b0bc2fce0d96cc2c013fb7dfa5c50591b28922f6 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 4 Jan 2019 15:34:31 +0100 Subject: [PATCH] [Fix] Handle bad offset on Paging by reducing offset to Paging.size --- .../src/main/java/li/strolch/utils/collections/Paging.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java b/li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java index 0d8cfb488..00606eb8b 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/collections/Paging.java @@ -135,6 +135,12 @@ public class Paging { return paging; } + // can happen if elements were removed and the user didn't see that, i.e. pressing next on a page that doesn't exist anymore + if (offset > paging.size) { + offset = paging.size; + paging.offset = offset; + } + paging.page = list.subList(offset, Math.min(paging.size, offset + limit)); if (limit == 1) {