From 7960754e8f7cd1fec3d5eb815d24596d82854172 Mon Sep 17 00:00:00 2001 From: brido4125 Date: Tue, 8 Aug 2023 12:13:48 +0900 Subject: [PATCH] INTERNAL: Change logic in getSubList method. --- .../java/net/spy/memcached/ArcusClient.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/spy/memcached/ArcusClient.java b/src/main/java/net/spy/memcached/ArcusClient.java index 326e32deb..5b173ae36 100644 --- a/src/main/java/net/spy/memcached/ArcusClient.java +++ b/src/main/java/net/spy/memcached/ArcusClient.java @@ -2097,27 +2097,20 @@ private Collection>> groupingKeys(List * @param count number of elements to get * @return list of elements */ - private List> getSubList( - final List> mergedResult, int offset, int count) { - if (mergedResult.size() > count) { - int toIndex = (count + offset > mergedResult.size()) - ? mergedResult.size() : count + offset; - if (offset > toIndex) { - return Collections.emptyList(); + private List> getSubList(final List> mergedResult, int offset, int count) { + if (offset > 0) { + if ((offset + count) < mergedResult.size()) { + return mergedResult.subList(offset, (offset + count)); } - return mergedResult.subList(offset, toIndex); + if (offset < mergedResult.size()) { + return mergedResult.subList(offset, mergedResult.size()); + } + return Collections.emptyList(); } else { - if (offset > 0) { - int toIndex = (count + offset > mergedResult.size()) - ? mergedResult.size() : count + offset; - - if (offset > toIndex) { - return Collections.emptyList(); - } - return mergedResult.subList(offset, toIndex); - } else { - return mergedResult; + if (count < mergedResult.size()) { + return mergedResult.subList(0, count); } + return mergedResult; } }