refactoring

redisson/src/main/java/org/redisson/RedissonNode.java

@@ -147,7 +147,7 @@ public class RedissonNode {
     private void retrieveAdresses() {
         ConnectionManager connectionManager = ((Redisson)redisson).getConnectionManager();
         for (MasterSlaveEntry entry : connectionManager.getEntrySet()) {
-            RFuture<RedisConnection> readFuture = entry.connectionReadOp(RedisCommands.PUBLISH);
+            RFuture<RedisConnection> readFuture = entry.connectionReadOp(null);
             if (readFuture.awaitUninterruptibly((long)connectionManager.getConfig().getConnectTimeout()) 
                     && readFuture.isSuccess()) {
                 RedisConnection connection = readFuture.getNow();
@@ -156,7 +156,7 @@ public class RedissonNode {
                 localAddress = (InetSocketAddress) connection.getChannel().localAddress();
                 return;
             }
-            RFuture<RedisConnection> writeFuture = entry.connectionWriteOp(RedisCommands.PUBLISH);
+            RFuture<RedisConnection> writeFuture = entry.connectionWriteOp(null);
             if (writeFuture.awaitUninterruptibly((long)connectionManager.getConfig().getConnectTimeout())
                     && writeFuture.isSuccess()) {
                 RedisConnection connection = writeFuture.getNow();

redisson/src/main/java/org/redisson/client/RedisConnection.java

@@ -52,15 +52,14 @@ public class RedisConnection implements RedisCommands {
     private long lastUsageTime;
 
     public RedisConnection(RedisClient redisClient, Channel channel) {
-        super();
+        this(redisClient);
-        this.redisClient = redisClient;
 
         updateChannel(channel);
         lastUsageTime = System.currentTimeMillis();
     }
     
-    protected RedisConnection() {
+    protected RedisConnection(RedisClient redisClient) {
-        redisClient = null;
+        this.redisClient = redisClient;
     }
 
     public static <C extends RedisConnection> C getFrom(Channel channel) {