Fixed - RedissonBlockingQueue should return null if negative timeout …

…defined. #4652
redisson · Nov 7, 2022 · edd644c · edd644c
1 parent 6036cde
commit edd644c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/redisson/src/main/java/org/redisson/RedissonBlockingQueue.java b/redisson/src/main/java/org/redisson/RedissonBlockingQueue.java
@@ -23,6 +23,7 @@
 import org.redisson.client.protocol.RedisCommands;
 import org.redisson.command.CommandAsyncExecutor;
 import org.redisson.connection.decoder.ListDrainToDecoder;
+import org.redisson.misc.CompletableFutureWrapper;
 
 import java.time.Duration;
 import java.util.*;
@@ -89,6 +90,9 @@ public V take() throws InterruptedException {
 
     @Override
     public RFuture<V> pollAsync(long timeout, TimeUnit unit) {
+        if (timeout < 0) {
+            return new CompletableFutureWrapper<>((V) null);
+        }
         return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BLPOP_VALUE, getRawName(), toSeconds(timeout, unit));
     }
 
@@ -116,6 +120,10 @@ public V pollFromAny(long timeout, TimeUnit unit, String... queueNames) throws I
      */
     @Override
     public RFuture<V> pollFromAnyAsync(long timeout, TimeUnit unit, String... queueNames) {
+        if (timeout < 0) {
+            return new CompletableFutureWrapper<>((V) null);
+        }
+
         return commandExecutor.pollFromAnyAsync(getRawName(), codec, RedisCommands.BLPOP_VALUE,
                                     toSeconds(timeout, unit), queueNames);
     }
@@ -160,6 +168,10 @@ public RFuture<Map<String, List<V>>> pollLastFromAnyAsync(Duration duration, int
 
     @Override
     public RFuture<V> pollLastAndOfferFirstToAsync(String queueName, long timeout, TimeUnit unit) {
+        if (timeout < 0) {
+            return new CompletableFutureWrapper<>((V) null);
+        }
+
         String mappedName = commandExecutor.getConnectionManager().getConfig().getNameMapper().map(queueName);
         return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BRPOPLPUSH, getRawName(), mappedName, toSeconds(timeout, unit));
     }