From 47a941da47518881e5d3e83d39b107bbd6b03754 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 11 Mar 2011 21:29:38 +0200
Subject: [PATCH] + minor NPE check (not needed but better to be safe)

---
 .../keyvalue/redis/connection/jedis/JedisConnectionFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
index 09f51d755..20cdfba51 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnectionFactory.java
@@ -87,7 +87,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
 	 */
 	protected Jedis fetchJedisConnector() {
 		try {
-			if (usePool) {
+			if (usePool && pool != null) {
 				return pool.getResource();
 			}
 			Jedis jedis = new Jedis(getShardInfo());