Fixed - NPE is thrown by RedisExecutor.handleError() method. #5641

redisson · Feb 20, 2024 · 8713829 · 8713829
1 parent ebc3051
commit 8713829
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
@@ -614,6 +614,10 @@ protected void onException() {
 
     protected void handleError(CompletableFuture<RedisConnection> connectionFuture, Throwable cause) {
         mainPromise.completeExceptionally(cause);
+        if (connectionFuture == null) {
+            return;
+        }
+
         RedisClient client = connectionFuture.join().getRedisClient();
         client.getConfig().getFailedNodeDetector().onCommandFailed(cause);
         if (client.getConfig().getFailedNodeDetector().isNodeFailed()) {

diff --git a/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java b/redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java
@@ -129,6 +129,10 @@ protected void handleError(CompletableFuture<RedisConnection> connectionFuture,
             sentPromise.completeExceptionally(cause);
             mainPromise.completeExceptionally(cause);
             if (executed.compareAndSet(false, true)) {
+                if (connectionFuture == null) {
+                    return;
+                }
+
                 RedisConnection c = getNow(connectionFuture);
                 if (c != null) {
                     c.forceFastReconnectAsync().whenComplete((res, e) -> {