From da3ebefee65542fe6f03e275002aaf5521c6d7da Mon Sep 17 00:00:00 2001 From: Sergey Eremin Date: Tue, 17 Oct 2017 19:12:47 +0300 Subject: [PATCH] Fixed an NPE happening when the user tries to get empty review list --- .../com/github/yeriomin/yalpstore/ReviewStorageIterator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java index 41458a987..c12997376 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewStorageIterator.java @@ -46,7 +46,8 @@ public class ReviewStorageIterator extends ReviewIterator { } private List current() { - int offset = PAGE_SIZE * page; - return list.subList(offset, offset + PAGE_SIZE); + int from = PAGE_SIZE * page; + int to = from + PAGE_SIZE; + return (from < 0 || to > list.size()) ? new ArrayList() : list.subList(from, to); } }