From f2d1b9d8e5c4af16000fdcc5c77b4e79405fcd66 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 25 May 2017 16:43:18 +0300 Subject: [PATCH] null values checking in RDelayedQueue object fixed --- .../src/main/java/org/redisson/RedissonDelayedQueue.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java b/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java index cc1c8f684..e545ba1bc 100644 --- a/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java +++ b/redisson/src/main/java/org/redisson/RedissonDelayedQueue.java @@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit; import org.redisson.api.RDelayedQueue; import org.redisson.api.RFuture; -import org.redisson.api.RQueue; import org.redisson.api.RTopic; import org.redisson.client.codec.Codec; import org.redisson.client.codec.LongCodec; @@ -417,7 +416,7 @@ public class RedissonDelayedQueue extends RedissonExpirable implements RDelay public RFuture peekAsync() { return commandExecutor.evalReadAsync(getName(), codec, RedisCommands.EVAL_OBJECT, "local v = redis.call('lindex', KEYS[1], 0); " - + "if v ~= nil then " + + "if v ~= false then " + "local randomId, value = struct.unpack('dLc0', v);" + "return value; " + "end " @@ -429,7 +428,7 @@ public class RedissonDelayedQueue extends RedissonExpirable implements RDelay public RFuture pollAsync() { return commandExecutor.evalWriteAsync(getName(), codec, RedisCommands.EVAL_OBJECT, "local v = redis.call('lpop', KEYS[1]); " - + "if v ~= nil then " + + "if v ~= false then " + "redis.call('zrem', KEYS[2], v); " + "local randomId, value = struct.unpack('dLc0', v);" + "return value; " @@ -447,7 +446,7 @@ public class RedissonDelayedQueue extends RedissonExpirable implements RDelay public RFuture pollLastAndOfferFirstToAsync(String queueName) { return commandExecutor.evalWriteAsync(getName(), codec, RedisCommands.EVAL_OBJECT, "local v = redis.call('rpop', KEYS[1]); " - + "if v ~= nil then " + + "if v ~= false then " + "redis.call('zrem', KEYS[2], v); " + "local randomId, value = struct.unpack('dLc0', v);" + "redis.call('lpush', KEYS[3], value); "