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/test/java/redis/clients/jedis/tests/JedisPoolTest.java
View File

@@ -228,4 +228,14 @@ public class JedisPoolTest extends Assert {
jedis2.close();
}
}
}
@Test
public void returnNullObjectShouldNotFail() {
JedisPool pool = new JedisPool(new JedisPoolConfig(), hnp.getHost(),
hnp.getPort(), 2000, "foobared", 0, "my_shiny_client_name");
pool.returnBrokenResource(null);
pool.returnResource(null);
pool.returnResourceObject(null);
}
}