From 36491a30425e85895805d98ce215ac808b2b971a Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 12 Jul 2021 12:43:56 +0300
Subject: [PATCH] Fixed - NPE thrown by RedisExecutor

---
 .../src/main/java/org/redisson/command/RedisExecutor.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
index 28720c8e8..cbe91b66f 100644
--- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java
@@ -233,7 +233,9 @@ public class RedisExecutor<V, R> {
 
                 if (attempt == attempts) {
                     // filled out in connectionFuture or writeFuture handler
-                    attemptPromise.tryFailure(exception);
+                    if (exception != null) {
+                        attemptPromise.tryFailure(exception);
+                    }
                     return;
                 }
                 if (!attemptPromise.cancel(false)) {