Merge branch 'null-check' of github.com:hgschmie/jedis into null-check

src/main/java/redis/clients/jedis/JedisPool.java

@@ -80,11 +80,15 @@ public class JedisPool extends Pool<Jedis> {
     }
 
     public void returnBrokenResource(final Jedis resource) {
+	if (resource != null) {
 	    returnBrokenResourceObject(resource);
 	}
+    }
 
     public void returnResource(final Jedis resource) {
+	if (resource != null) {
 	    resource.resetState();
 	    returnResourceObject(resource);
 	}
     }
+}

src/main/java/redis/clients/util/Pool.java

@@ -54,12 +54,16 @@ public abstract class Pool<T> {
     }
 
     public void returnBrokenResource(final T resource) {
+	if (resource != null) {
 	    returnBrokenResourceObject(resource);
 	}
+    }
 
     public void returnResource(final T resource) {
+	if (resource != null) {
 	    returnResourceObject(resource);
 	}
+    }
 
     public void destroy() {
 	closeInternalPool();