From 62b98a3e633434e4f635d4ef1ca0076d4404df42 Mon Sep 17 00:00:00 2001
From: Jonathan Leibiusky <jleibiusky@gilt.com>
Date: Wed, 12 Mar 2014 10:31:22 -0400
Subject: [PATCH] Add tests to check returning null to pool

---
 src/main/java/redis/clients/util/Pool.java             |  3 +++
 .../java/redis/clients/jedis/tests/JedisPoolTest.java  | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/main/java/redis/clients/util/Pool.java b/src/main/java/redis/clients/util/Pool.java
index 2b0d91f..659c731 100644
--- a/src/main/java/redis/clients/util/Pool.java
+++ b/src/main/java/redis/clients/util/Pool.java
@@ -45,6 +45,9 @@ public abstract class Pool<T> {
     }
 
     public void returnResourceObject(final T resource) {
+	if (resource == null) {
+	    return;
+	}
 	try {
 	    internalPool.returnObject(resource);
 	} catch (Exception e) {
diff --git a/src/test/java/redis/clients/jedis/tests/JedisPoolTest.java b/src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
index a501024..514d3b5 100644
--- a/src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
+++ b/src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
@@ -198,4 +198,14 @@ public class JedisPoolTest extends Assert {
 	pool.returnResource(jedis2);
 	pool.destroy();
     }
+    
+    @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);
+    }
 }