From fc0f4afc25327a55d88a953eee6c2005c51b912a Mon Sep 17 00:00:00 2001 From: Nikita Date: Sat, 12 May 2018 17:09:45 +0300 Subject: [PATCH 1/2] WriteRedisConnectionException should extends RedisConnectionException --- .../java/org/redisson/client/WriteRedisConnectionException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java b/redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java index 84a19b3af..1c2faa34b 100644 --- a/redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java +++ b/redisson/src/main/java/org/redisson/client/WriteRedisConnectionException.java @@ -20,7 +20,7 @@ package org.redisson.client; * @author Nikita Koksharov * */ -public class WriteRedisConnectionException extends RedisException { +public class WriteRedisConnectionException extends RedisConnectionException { private static final long serialVersionUID = -4756928186967834601L; From 8b2645e62948757f7f1c6afb9de69e697941c022 Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 14 May 2018 11:20:28 +0300 Subject: [PATCH 2/2] refactoring --- redisson/src/main/java/org/redisson/misc/URIBuilder.java | 8 -------- .../org/redisson/transaction/RedissonTransaction.java | 1 - 2 files changed, 9 deletions(-) diff --git a/redisson/src/main/java/org/redisson/misc/URIBuilder.java b/redisson/src/main/java/org/redisson/misc/URIBuilder.java index 1cbc56def..ea5d2645b 100644 --- a/redisson/src/main/java/org/redisson/misc/URIBuilder.java +++ b/redisson/src/main/java/org/redisson/misc/URIBuilder.java @@ -18,12 +18,8 @@ package org.redisson.misc; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.URI; -import java.net.UnknownHostException; - -import io.netty.util.NetUtil; /** * @@ -69,10 +65,6 @@ public class URIBuilder { } public static boolean compare(InetSocketAddress entryAddr, URI addr) { - if (addr.getHost().equals("localhost")) { - System.out.println("host to compare: " + addr.getHost()); - } - if (((entryAddr.getHostName() != null && entryAddr.getHostName().equals(addr.getHost())) || entryAddr.getAddress().getHostAddress().equals(addr.getHost())) && entryAddr.getPort() == addr.getPort()) { diff --git a/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java b/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java index 2c8ce9d68..31b50c692 100644 --- a/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java +++ b/redisson/src/main/java/org/redisson/transaction/RedissonTransaction.java @@ -186,7 +186,6 @@ public class RedissonTransaction implements RTransaction { final CommandBatchService transactionExecutor = new CommandBatchService(commandExecutor.getConnectionManager()); for (TransactionalOperation transactionalOperation : operations) { - System.out.println("transactionalOperation " + transactionalOperation); transactionalOperation.commit(transactionExecutor); }