From aebcb56c3c1e2ac3cc9309ec5ab9632ca095768f Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Thu, 14 Apr 2011 19:53:55 +0300 Subject: [PATCH] DATAKV-63 + reset the selected db when the connection is closed --- .../keyvalue/redis/connection/jedis/JedisConnection.java | 5 +++++ .../data/keyvalue/redis/connection/rjc/RjcConnection.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java index 410f5fef8..0d751765a 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/jedis/JedisConnection.java @@ -129,6 +129,11 @@ public class JedisConnection implements RedisConnection { pool.returnBrokenResource(jedis); } else { + // reset the connection + if (dbIndex > 0) { + select(0); + } + pool.returnResource(jedis); } } diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/rjc/RjcConnection.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/rjc/RjcConnection.java index 50d5f78f0..5b9c739a1 100644 --- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/rjc/RjcConnection.java +++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/connection/rjc/RjcConnection.java @@ -80,6 +80,11 @@ public class RjcConnection implements RedisConnection { public void close() throws DataAccessException { isClosed = true; + // reset the connection (in case a pool is being used) + if (dbIndex > 0) { + select(0); + } + try { subscriber.close(); session.close();