Fixed - RBatch with executionMode = REDIS_WRITE_ATOMIC throws NPE in case of connection starvation.

2 years ago · 95fe0bdc2f
parent 0e5c759602
commit 95fe0bdc2f
1 changed files with 4 additions and 3 deletions
--- a/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
@ -198,15 +198,16 @@ public class RedisQueuedBatchExecutor<V, R> extends BaseRedisBatchExecutor<V, R>

        
        if (entry.getConnectionFuture() != null) {
-            return entry.getConnectionFuture();
+            connectionFuture = entry.getConnectionFuture();
+            return connectionFuture;
        }
        
        synchronized (this) {
            if (entry.getConnectionFuture() != null) {
-                return entry.getConnectionFuture();
+                connectionFuture = entry.getConnectionFuture();
+                return connectionFuture;
            }

-            CompletableFuture<RedisConnection> connectionFuture;
            if (this.options.getExecutionMode() == ExecutionMode.REDIS_WRITE_ATOMIC) {
                connectionFuture = connectionManager.connectionWriteOp(source, null);
            } else {