From cd38c340f4f1b6ec1ca18f4ea65f1762c78d5c21 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Thu, 6 Aug 2020 09:35:19 +0300 Subject: [PATCH] refactoring --- .../connection/MasterSlaveConnectionManager.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 1558bc4b4..dd6003674 100644 --- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -354,24 +354,21 @@ public class MasterSlaveConnectionManager implements ConnectionManager { protected void initSingleEntry() { try { - MasterSlaveEntry entry; if (config.checkSkipSlavesInit()) { - entry = new SingleEntry(this, config); + masterSlaveEntry = new SingleEntry(this, config); } else { - entry = new MasterSlaveEntry(this, config); + masterSlaveEntry = new MasterSlaveEntry(this, config); } - RFuture masterFuture = entry.setupMasterEntry(new RedisURI(config.getMasterAddress())); + RFuture masterFuture = masterSlaveEntry.setupMasterEntry(new RedisURI(config.getMasterAddress())); masterFuture.syncUninterruptibly(); if (!config.checkSkipSlavesInit()) { - List> fs = entry.initSlaveBalancer(getDisconnectedNodes(), masterFuture.getNow()); + List> fs = masterSlaveEntry.initSlaveBalancer(getDisconnectedNodes(), masterFuture.getNow()); for (RFuture future : fs) { future.syncUninterruptibly(); } } - masterSlaveEntry = entry; - startDNSMonitoring(masterFuture.getNow()); } catch (Exception e) { stopThreads();