From 7b6006b66970d73742668e110247890ca1b878f1 Mon Sep 17 00:00:00 2001
From: mindwind <mindwind@163.com>
Date: Sat, 29 Jun 2013 12:59:32 +0800
Subject: [PATCH] merge - jedis pull request #429

---
 src/main/java/redis/clients/jedis/JedisPool.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/redis/clients/jedis/JedisPool.java b/src/main/java/redis/clients/jedis/JedisPool.java
index b996217..1e0ead6 100644
--- a/src/main/java/redis/clients/jedis/JedisPool.java
+++ b/src/main/java/redis/clients/jedis/JedisPool.java
@@ -103,6 +103,16 @@ public class JedisPool extends Pool<Jedis> {
             
             return jedis;
         }
+        
+        @Override
+        public void activateObject(Object obj) throws Exception {
+			if (obj instanceof Jedis) {
+	            final Jedis jedis = (Jedis)obj;
+	            if (jedis.getDB() != database) {
+	            	jedis.select(database);
+	            }
+			}
+        }
 
         public void destroyObject(final Object obj) throws Exception {
             if (obj instanceof Jedis) {