From 46eef9530b4a6f493ed1ab1e677213467461bfbe Mon Sep 17 00:00:00 2001
From: Henning Schmiedehausen <henning@groupon.com>
Date: Thu, 27 Feb 2014 10:58:46 -0800
Subject: [PATCH] add a number of null check to return methods.

This allows calling these methods on error cleanup paths without having
to surround them with if checks all the time.
---
 src/main/java/redis/clients/jedis/JedisPool.java | 10 +++++++---
 src/main/java/redis/clients/util/Pool.java       | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java
index 6b2c80c..8e34d19 100644
--- a/src/main/java/redis/clients/jedis/JedisPool.java
+++ b/src/main/java/redis/clients/jedis/JedisPool.java
@@ -80,11 +80,15 @@ public class JedisPool extends Pool<Jedis> {
     }
 
     public void returnBrokenResource(final Jedis resource) {
-	returnBrokenResourceObject(resource);
+	if (resource != null) {
+	    returnBrokenResourceObject(resource);
+	}
     }
 
     public void returnResource(final Jedis resource) {
-	resource.resetState();
-	returnResourceObject(resource);
+	if (resource != null) {
+	    resource.resetState();
+	    returnResourceObject(resource);
+	}
     }
 }
diff --git a/src/main/java/redis/clients/util/Pool.java b/src/main/java/redis/clients/util/Pool.java
index 09d8ebb..2b0d91f 100644
--- a/src/main/java/redis/clients/util/Pool.java
+++ b/src/main/java/redis/clients/util/Pool.java
@@ -54,11 +54,15 @@ public abstract class Pool<T> {
     }
 
     public void returnBrokenResource(final T resource) {
-	returnBrokenResourceObject(resource);
+	if (resource != null) {
+	    returnBrokenResourceObject(resource);
+	}
     }
 
     public void returnResource(final T resource) {
-	returnResourceObject(resource);
+	if (resource != null) {
+	    returnResourceObject(resource);
+	}
     }
 
     public void destroy() {
@@ -81,4 +85,4 @@ public abstract class Pool<T> {
 	    throw new JedisException("Could not destroy the pool", e);
 	}
     }
-}
\ No newline at end of file
+}