From 3c132084ff53ae121895ea95f9fcc89f765bc599 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Tue, 1 Dec 2015 17:52:53 +0300
Subject: [PATCH] shutdown check in ConnectionWatchdog.channelInactive added. 
 #307

---
 .../org/redisson/client/handler/ConnectionWatchdog.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java b/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
index 3fada1826..9fb766f9f 100644
--- a/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
+++ b/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
@@ -58,6 +58,10 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        if (ctx.channel().eventLoop().parent().isShuttingDown()) {
+            return;
+        }
+
         RedisConnection connection = RedisConnection.getFrom(ctx.channel());
         if (!connection.isClosed()) {
             EventLoopGroup group = ctx.channel().eventLoop().parent();
@@ -112,8 +116,6 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
                     }
                 }, timeout, TimeUnit.MILLISECONDS);
             }
-
-
         });
     }