rik/jlibredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into implements-closeable-to-pooled-jedis-shardedjedis

Browse Source 
Conflicts:
	src/main/java/redis/clients/jedis/Jedis.java
	src/main/java/redis/clients/jedis/JedisSentinelPool.java
	src/main/java/redis/clients/jedis/ShardedJedis.java
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
This commit is contained in:
Jungtaek Lim
2014-05-26 11:18:45 +09:00
parent 670e019a89 0a8aa7ae1d
commit 6f8d46ae4f
53 changed files with 2195 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/redis/clients/jedis/JedisSentinelPool.java
View File

@@ -169,15 +169,17 @@ public class JedisSentinelPool extends Pool<Jedis> {
return jedis;
}
@Override
public void returnBrokenResource(final Jedis resource) {
returnBrokenResourceObject(resource);
if (resource != null) {
returnBrokenResourceObject(resource);
}
}
@Override
public void returnResource(final Jedis resource) {
resource.resetState();
returnResourceObject(resource);
if (resource != null) {
resource.resetState();
returnResourceObject(resource);
}
}
protected class JedisPubSubAdapter extends JedisPubSub {