remove impossible reach branch and the useless variable for RedisRegistry.java (#6862)
diff --git a/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java
index dcf8752..8936e79 100644
--- a/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java
+++ b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java
@@ -79,12 +79,8 @@
private static final Logger logger = LoggerFactory.getLogger(RedisRegistry.class);
- private static final int DEFAULT_REDIS_PORT = 6379;
-
private final static String DEFAULT_ROOT = "dubbo";
- private static final String REDIS_MASTER_NAME_KEY = "master-name";
-
private final ScheduledExecutorService expireExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("DubboRegistryExpireTimer", true));
private final ScheduledFuture<?> expireFuture;
@@ -101,8 +97,6 @@
private volatile boolean admin = false;
- private boolean replicate;
-
public RedisRegistry(URL url) {
super(url);
String type = url.getParameter(REDIS_CLIENT_KEY, MONO_REDIS);
@@ -214,21 +208,11 @@
String key = toCategoryPath(url);
String value = url.toFullString();
String expire = String.valueOf(System.currentTimeMillis() + expirePeriod);
- boolean success = false;
- RpcException exception = null;
try {
redisClient.hset(key, value, expire);
redisClient.publish(key, REGISTER);
} catch (Throwable t) {
- exception = new RpcException("Failed to register service to redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
- }
-
- if (exception != null) {
- if (success) {
- logger.warn(exception.getMessage(), exception);
- } else {
- throw exception;
- }
+ throw new RpcException("Failed to register service to redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
}
}
@@ -236,22 +220,11 @@
public void doUnregister(URL url) {
String key = toCategoryPath(url);
String value = url.toFullString();
- RpcException exception = null;
- boolean success = false;
try {
redisClient.hdel(key, value);
redisClient.publish(key, UNREGISTER);
- success = true;
} catch (Throwable t) {
- exception = new RpcException("Failed to unregister service to redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
- }
-
- if (exception != null) {
- if (success) {
- logger.warn(exception.getMessage(), exception);
- } else {
- throw exception;
- }
+ throw new RpcException("Failed to unregister service to redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
}
}
@@ -267,8 +240,6 @@
notifier.start();
}
}
- boolean success = false;
- RpcException exception = null;
try {
if (service.endsWith(ANY_VALUE)) {
admin = true;
@@ -287,16 +258,8 @@
} else {
doNotify(redisClient.scan(service + PATH_SEPARATOR + ANY_VALUE), url, Collections.singletonList(listener));
}
- success = true;
} catch (Throwable t) {
- exception = new RpcException("Failed to subscribe service from redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
- }
- if (exception != null) {
- if (success) {
- logger.warn(exception.getMessage(), exception);
- } else {
- throw exception;
- }
+ throw new RpcException("Failed to subscribe service from redis registry. registry: " + url.getAddress() + ", service: " + url + ", cause: " + t.getMessage(), t);
}
}
