From f77034bb026aac11734ace7fbf75fb53a30f3eb9 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Fri, 4 Sep 2015 17:08:28 +0300
Subject: [PATCH] possible NPE during watchdog reconnection fixed. #235

---
 src/main/java/org/redisson/client/RedisConnection.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/redisson/client/RedisConnection.java b/src/main/java/org/redisson/client/RedisConnection.java
index 7ec96863b..c521ff7dd 100644
--- a/src/main/java/org/redisson/client/RedisConnection.java
+++ b/src/main/java/org/redisson/client/RedisConnection.java
@@ -42,13 +42,13 @@ public class RedisConnection implements RedisCommands {
     public RedisConnection(RedisClient redisClient, Channel channel) {
         super();
         this.redisClient = redisClient;
-        this.channel = channel;
 
-        channel.attr(CONNECTION).set(this);
+        updateChannel(channel);
     }
 
     public void updateChannel(Channel channel) {
         this.channel = channel;
+        channel.attr(CONNECTION).set(this);
     }
 
     public RedisClient getRedisClient() {