diff --git a/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java b/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java index c273f2cd9..7fcf6d2a1 100644 --- a/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java +++ b/redisson/src/main/java/org/redisson/config/SentinelServersConfig.java @@ -197,6 +197,14 @@ public class SentinelServersConfig extends BaseMasterSlaveServersConfig + * Default is true + * + * @param checkSlaveStatusWithSyncing - boolean value + * @return config + */ public SentinelServersConfig setCheckSlaveStatusWithSyncing(boolean checkSlaveStatusWithSyncing) { this.checkSlaveStatusWithSyncing = checkSlaveStatusWithSyncing; return this; diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java index ad6c178ee..0706e463c 100755 --- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java @@ -20,6 +20,7 @@ import io.netty.util.NetUtil; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.ScheduledFuture; +import io.netty.util.internal.StringUtil; import org.redisson.api.NatMapper; import org.redisson.api.NodeType; import org.redisson.api.RFuture; @@ -34,7 +35,6 @@ import org.redisson.misc.RedisURI; import org.redisson.misc.RedissonPromise; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.StringUtils; import java.net.InetSocketAddress; import java.util.*; @@ -599,7 +599,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager { private boolean isSlaveDown(String flags, String masterLinkStatus) { boolean baseStatus = flags.contains("s_down") || flags.contains("disconnected"); - if (this.checkSlaveStatusWithSyncing && StringUtils.hasText(masterLinkStatus)) { + if (this.checkSlaveStatusWithSyncing && !StringUtil.isNullOrEmpty(masterLinkStatus)) { return baseStatus || masterLinkStatus.contains("err"); } return baseStatus;