From 47cf07b09f0d628239d9b35b4f133298031d6a2c Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Sun, 16 Jun 2013 13:36:09 -0700 Subject: [PATCH] Only return JRedis conns to pool on conn Exceptions --- .../data/redis/connection/jredis/JredisConnection.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java index de76e1da5..158906c21 100644 --- a/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java +++ b/src/main/java/org/springframework/data/redis/connection/jredis/JredisConnection.java @@ -30,6 +30,8 @@ import org.jredis.JRedis; import org.jredis.Query.Support; import org.jredis.RedisException; import org.jredis.Sort; +import org.jredis.connector.ConnectionException; +import org.jredis.connector.NotConnectedException; import org.jredis.protocol.Command; import org.jredis.ri.alphazero.JRedisSupport; import org.springframework.dao.DataAccessException; @@ -81,12 +83,14 @@ public class JredisConnection implements RedisConnection { } protected DataAccessException convertJredisAccessException(Exception ex) { - broken = true; if (ex instanceof RedisException) { return JredisUtils.convertJredisAccessException((RedisException) ex); } if (ex instanceof ClientRuntimeException) { + if(ex instanceof NotConnectedException || ex instanceof ConnectionException) { + broken = true; + } return JredisUtils.convertJredisAccessException((ClientRuntimeException) ex); }