From 0bbc332e3788cf7b0532cd83b5a923f096962f9f Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 10 Feb 2016 11:18:55 +0300
Subject: [PATCH] Cancel command retry if Redisson in shutdown mode. #402

---
 src/main/java/org/redisson/command/CommandAsyncService.java | 4 ++++
 src/main/java/org/redisson/command/CommandBatchService.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/org/redisson/command/CommandAsyncService.java b/src/main/java/org/redisson/command/CommandAsyncService.java
index d8c44d2fa..3376248b8 100644
--- a/src/main/java/org/redisson/command/CommandAsyncService.java
+++ b/src/main/java/org/redisson/command/CommandAsyncService.java
@@ -390,6 +390,10 @@ public class CommandAsyncService implements CommandAsyncExecutor {
                     }
                 }
 
+                if (connectionManager.isShuttingDown()) {
+                    return;
+                }
+
                 if (details.getMainPromise().isCancelled()) {
                     if (details.getAttemptPromise().cancel(false)) {
                         AsyncDetails.release(details);
diff --git a/src/main/java/org/redisson/command/CommandBatchService.java b/src/main/java/org/redisson/command/CommandBatchService.java
index 6bf4083cb..4d8dd33cb 100644
--- a/src/main/java/org/redisson/command/CommandBatchService.java
+++ b/src/main/java/org/redisson/command/CommandBatchService.java
@@ -233,6 +233,10 @@ public class CommandBatchService extends CommandReactiveService {
                     }
                 }
 
+                if (connectionManager.isShuttingDown()) {
+                    return;
+                }
+
                 if (mainPromise.isCancelled()) {
                     attemptPromise.cancel(false);
                     return;