From 4e7724eddff70fd43d74e99c1ec01cf52a47e379 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Mon, 11 Sep 2023 13:38:01 +0300
Subject: [PATCH] refactoring

---
 .../org/redisson/client/handler/PingConnectionHandler.java   | 5 +----
 .../java/org/redisson/command/RedisCommonBatchExecutor.java  | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
index 0a849b3fa..803a49636 100644
--- a/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
+++ b/redisson/src/main/java/org/redisson/client/handler/PingConnectionHandler.java
@@ -84,10 +84,7 @@ public class PingConnectionHandler extends ChannelInboundHandlerAdapter {
 
                 Throwable cause = cause(future);
 
-                if (!(cause instanceof RedisLoadingException
-                        || cause instanceof RedisTryAgainException
-                            || cause instanceof RedisClusterDownException
-                                || cause instanceof RedisBusyException)) {
+                if (!(cause instanceof RedisRetryException)) {
                     if (!future.isCancelled()) {
                         log.error("Unable to send PING command over channel: {}", ctx.channel(), cause);
                     }
diff --git a/redisson/src/main/java/org/redisson/command/RedisCommonBatchExecutor.java b/redisson/src/main/java/org/redisson/command/RedisCommonBatchExecutor.java
index 794430dde..354aeddd4 100644
--- a/redisson/src/main/java/org/redisson/command/RedisCommonBatchExecutor.java
+++ b/redisson/src/main/java/org/redisson/command/RedisCommonBatchExecutor.java
@@ -161,10 +161,10 @@ public class RedisCommonBatchExecutor extends RedisExecutor<Object, Void> {
     protected void handleResult(CompletableFuture<Void> attemptPromise, CompletableFuture<RedisConnection> connectionFuture) throws ReflectiveOperationException {
         if (attemptPromise.isDone() && !attemptPromise.isCompletedExceptionally()) {
             if (slots.decrementAndGet() == 0) {
-                mainPromise.complete(null);
+                handleSuccess(mainPromise, connectionFuture, null);
             }
         } else {
-            mainPromise.completeExceptionally(cause(attemptPromise));
+            handleError(connectionFuture, cause(attemptPromise));
         }
     }