From a20e3fc4d421c56f15125f1eb4b9db8054269455 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 24 Apr 2015 17:32:09 +0300 Subject: [PATCH] retainAll & addAll fixed --- src/main/java/org/redisson/RedissonList.java | 10 +++------- src/main/java/org/redisson/RedissonSet.java | 4 ---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/redisson/RedissonList.java b/src/main/java/org/redisson/RedissonList.java index 0c21713b3..a2fa70cd4 100644 --- a/src/main/java/org/redisson/RedissonList.java +++ b/src/main/java/org/redisson/RedissonList.java @@ -152,14 +152,14 @@ public class RedissonList extends RedissonExpirable implements RList { @Override public boolean addAll(Collection c) { - if (c.isEmpty()) { - return false; - } return connectionManager.get(addAllAsync(c)); } @Override public Future addAllAsync(final Collection c) { + if (c.isEmpty()) { + return connectionManager.getGroup().next().newSucceededFuture(false); + } return connectionManager.writeAsync(getName(), new AsyncOperation() { @Override public void execute(final Promise promise, RedisAsyncConnection async) { @@ -236,10 +236,6 @@ public class RedissonList extends RedissonExpirable implements RList { @Override public boolean retainAll(Collection c) { - if (c.isEmpty()) { - return false; - } - boolean changed = false; for (Iterator iterator = iterator(); iterator.hasNext();) { V object = iterator.next(); diff --git a/src/main/java/org/redisson/RedissonSet.java b/src/main/java/org/redisson/RedissonSet.java index 40b660146..9e1fde9a5 100644 --- a/src/main/java/org/redisson/RedissonSet.java +++ b/src/main/java/org/redisson/RedissonSet.java @@ -219,10 +219,6 @@ public class RedissonSet extends RedissonExpirable implements RSet { @Override public boolean retainAll(Collection c) { - if (c.isEmpty()) { - return false; - } - boolean changed = false; for (Object object : this) { if (!c.contains(object)) {