Merge branch 'master' into 3.0.0

pull/1821/head
Nikita 7 years ago
commit 7b23774a12

@ -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;

@ -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()) {

@ -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);
}

Loading…
Cancel
Save