From af18eb09a393e862f11c6c1bad92db73c1d9b171 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 28 Sep 2016 16:43:34 +0300
Subject: [PATCH] NPE in ConnectionWatchdog fixed

---
 .../client/handler/ConnectionWatchdog.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java b/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
index dbe42272d..43ce2a090 100644
--- a/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
+++ b/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
@@ -65,13 +65,15 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         RedisConnection connection = RedisConnection.getFrom(ctx.channel());
-        connection.onDisconnect();
-        if (!connection.isClosed()) {
-            if (connection.isFastReconnect()) {
-                tryReconnect(connection, 1);
-                connection.clearFastReconnect();
-            } else {
-                reconnect(connection, 1);
+        if (connection != null) {
+            connection.onDisconnect();
+            if (!connection.isClosed()) {
+                if (connection.isFastReconnect()) {
+                    tryReconnect(connection, 1);
+                    connection.clearFastReconnect();
+                } else {
+                    reconnect(connection, 1);
+                }
             }
         }
         ctx.fireChannelInactive();