Completed fix for http://code.google.com/p/mybatis/issues/detail?id=139 (257) -- Cache causes provided result handler to fail.

Now selectMap and provided resultHandlers both work with local and global caches

Author: cbegin

src/main/java/org/apache/ibatis/executor/BaseExecutor.java

@@ -105,7 +105,7 @@ public List query(MappedStatement ms, Object parameter, RowBounds rowBounds, Res
     try {
       queryStack++;
       CacheKey key = createCacheKey(ms, parameter, rowBounds);
-      list = (List) localCache.getObject(key);
+      list = resultHandler == null ? (List) localCache.getObject(key) : null;
       if (list != null) {
         handleLocallyCachedOutputParameters(ms, key, parameter);
       } else {

src/main/java/org/apache/ibatis/executor/CachingExecutor.java

@@ -51,7 +51,7 @@ public List query(MappedStatement ms, Object parameterObject, RowBounds rowBound
         flushCacheIfRequired(ms);
         cache.getReadWriteLock().readLock().lock();
         try {
-          if (ms.isUseCache()) {
+          if (ms.isUseCache() && resultHandler == null) {
             CacheKey key = createCacheKey(ms, parameterObject, rowBounds);
             final List cachedList = (List) cache.getObject(key);
             if (cachedList != null) {

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -1,6 +1,7 @@
 package org.apache.ibatis.binding;
 
 import domain.blog.*;
+import org.apache.ibatis.executor.result.DefaultResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -135,6 +136,46 @@ public void shouldExecuteBoundSelectMapOfBlogsById() {
     }
   }
 
+  @Test
+  public void shouldExecuteMultipleBoundSelectOfBlogsByIdInWithProvidedResultHandlerBetweenSessions() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      final DefaultResultHandler handler = new DefaultResultHandler();
+      session.select("selectBlogsAsMapById", handler);
+
+      //new session
+      session.close();
+      session = sqlSessionFactory.openSession();
+
+      final DefaultResultHandler moreHandler = new DefaultResultHandler();
+      session.select("selectBlogsAsMapById", moreHandler);
+      
+      assertEquals(2, handler.getResultList().size());
+      assertEquals(2, moreHandler.getResultList().size());
+
+    } finally {
+      session.close();
+    }
+  }
+
+  @Test
+  public void shouldExecuteMultipleBoundSelectOfBlogsByIdInWithProvidedResultHandlerInSameSession() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      final DefaultResultHandler handler = new DefaultResultHandler();
+      session.select("selectBlogsAsMapById", handler);
+
+      final DefaultResultHandler moreHandler = new DefaultResultHandler();
+      session.select("selectBlogsAsMapById", moreHandler);
+
+      assertEquals(2, handler.getResultList().size());
+      assertEquals(2, moreHandler.getResultList().size());
+
+    } finally {
+      session.close();
+    }
+  }
+
   @Test
   public void shouldExecuteMultipleBoundSelectMapOfBlogsByIdInSameSessionWithoutClearingLocalCache() {
     SqlSession session = sqlSessionFactory.openSession();