ISSUE 78: Removed logic that waits forever till all shards are connected in ShardedJedisPool
Ensuered that all commands connect at the beginning if necessary.
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package redis.clients.jedis;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
@@ -11,13 +9,13 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import redis.clients.jedis.BinaryClient.LIST_POSITION;
|
||||
import redis.clients.jedis.exceptions.JedisDataException;
|
||||
import redis.clients.jedis.exceptions.JedisException;
|
||||
import redis.clients.util.JedisByteHashMap;
|
||||
import redis.clients.util.SafeEncoder;
|
||||
|
||||
public class BinaryJedis implements BinaryJedisCommands {
|
||||
protected Client client = null;
|
||||
protected String password = null;
|
||||
|
||||
public BinaryJedis(final String host) {
|
||||
client = new Client(host);
|
||||
@@ -35,7 +33,7 @@ public class BinaryJedis implements BinaryJedisCommands {
|
||||
public BinaryJedis(final JedisShardInfo shardInfo) {
|
||||
client = new Client(shardInfo.getHost(), shardInfo.getPort());
|
||||
client.setTimeout(shardInfo.getTimeout());
|
||||
this.password = shardInfo.getPassword();
|
||||
client.setPassword(shardInfo.getPassword());
|
||||
}
|
||||
|
||||
public String ping() {
|
||||
@@ -1649,16 +1647,16 @@ public class BinaryJedis implements BinaryJedisCommands {
|
||||
|
||||
protected void checkIsInMulti() {
|
||||
if (client.isInMulti()) {
|
||||
throw new JedisException(
|
||||
throw new JedisDataException(
|
||||
"Cannot use Jedis when in Multi. Please use JedisTransaction instead.");
|
||||
}
|
||||
}
|
||||
|
||||
public void connect() throws UnknownHostException, IOException {
|
||||
public void connect() {
|
||||
client.connect();
|
||||
}
|
||||
|
||||
public void disconnect() throws IOException {
|
||||
public void disconnect() {
|
||||
client.disconnect();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user