From 1c00dcb8da5a062188858d8e44ee3e29b29472d3 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 27 Dec 2016 15:25:12 +0300 Subject: [PATCH] refactoring --- redisson/src/main/java/org/redisson/RedissonNode.java | 4 ++-- .../src/main/java/org/redisson/client/RedisConnection.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonNode.java b/redisson/src/main/java/org/redisson/RedissonNode.java index 2ed91c3c8..52e30a141 100644 --- a/redisson/src/main/java/org/redisson/RedissonNode.java +++ b/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 readFuture = entry.connectionReadOp(RedisCommands.PUBLISH); + RFuture 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 writeFuture = entry.connectionWriteOp(RedisCommands.PUBLISH); + RFuture writeFuture = entry.connectionWriteOp(null); if (writeFuture.awaitUninterruptibly((long)connectionManager.getConfig().getConnectTimeout()) && writeFuture.isSuccess()) { RedisConnection connection = writeFuture.getNow(); diff --git a/redisson/src/main/java/org/redisson/client/RedisConnection.java b/redisson/src/main/java/org/redisson/client/RedisConnection.java index e0fe7c07c..23c64625c 100644 --- a/redisson/src/main/java/org/redisson/client/RedisConnection.java +++ b/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 = redisClient; + this(redisClient); updateChannel(channel); lastUsageTime = System.currentTimeMillis(); } - protected RedisConnection() { - redisClient = null; + protected RedisConnection(RedisClient redisClient) { + this.redisClient = redisClient; } public static C getFrom(Channel channel) {