http://code.google.com/p/mybatis/issues/detail?id=573 . fix deadlock and added a test

Author: emacarron

src/main/java/org/apache/ibatis/cache/TransactionalCacheManager.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2012 The MyBatis Team
+ *    Copyright 2009-2011 The MyBatis Team
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,24 +23,13 @@
 public class TransactionalCacheManager {
 
   private Map<Cache, TransactionalCache> transactionalCaches = new HashMap<Cache, TransactionalCache>();
-  private boolean autoCommit; // issue #573. No need to call commit() on autoCommit sessions
-  
-  public TransactionalCacheManager(){
-    this(false);
-  }
-  
-  public TransactionalCacheManager(boolean autoCommit) {
-    this.autoCommit = autoCommit;
-  }
-  
+
   public void clear(Cache cache) {
     getTransactionalCache(cache).clear();
-    if (autoCommit) commit();
   }
 
   public void putObject(Cache cache, CacheKey key, Object value) {
     getTransactionalCache(cache).putObject(key, value);
-    if (autoCommit) commit();
   }
 
   public void commit() {

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

@@ -35,7 +35,7 @@ public class CachingExecutor implements Executor {
 
   private Executor delegate;
   private boolean autoCommit; // issue #573. No need to call commit() on autoCommit sessions
-  private TransactionalCacheManager tcm;
+  private TransactionalCacheManager tcm = new TransactionalCacheManager();
 
   private boolean dirty;
 
@@ -46,7 +46,6 @@ public CachingExecutor(Executor delegate) {
   public CachingExecutor(Executor delegate, boolean autoCommit) {
     this.delegate = delegate;
     this.autoCommit = autoCommit;
-    this.tcm = new TransactionalCacheManager(autoCommit);
   }
 
   public Transaction getTransaction() {
@@ -154,9 +153,11 @@ public void clearLocalCache() {
 
   private void flushCacheIfRequired(MappedStatement ms) {
     Cache cache = ms.getCache();
-    if (cache != null && ms.isFlushCacheRequired()) {
-      tcm.clear(cache);
-      if (!autoCommit) dirty = true; // issue #524. Disable using cached data for this session because data may have changed
+    if (cache != null) {
+      if (ms.isFlushCacheRequired()) {
+        if (!autoCommit) dirty = true; // issue #524. Disable using cached data for this session
+        tcm.clear(cache);
+      }
     }
   }
 

src/test/java/org/apache/ibatis/submitted/cache/CacheTest.java

@@ -97,7 +97,7 @@ public void testplan1() {
    *   Step 6 returns 2 rows. 
    */
   @Test
-  public void testplan5() {
+  public void testplan2() {
     SqlSession sqlSession1 = sqlSessionFactory.openSession(false);
     try {
       PersonMapper pm = sqlSession1.getMapper(PersonMapper.class);
@@ -126,5 +126,47 @@ public void testplan5() {
       sqlSession3.close();
     }
   }
+  
+  /*
+   * Test Plan with Autocommit on:
+   *  1) SqlSession 1 executes "select * from A".
+   *  2) SqlSession 1 closes.
+   *  3) SqlSession 2 executes "delete from A where id = 1"
+   *  4) SqlSession 2 closes.
+   *  5) SqlSession 2 executes "select * from A".
+   *  6) SqlSession 3 closes.
+   *
+   * Assert:
+   *   Step 6 returns 1 row. 
+   */
+  @Test
+  public void testplan3() {
+    SqlSession sqlSession1 = sqlSessionFactory.openSession(true);
+    try {
+      PersonMapper pm = sqlSession1.getMapper(PersonMapper.class);
+      Assert.assertEquals(2, pm.findAll().size());
+    }
+    finally {
+      sqlSession1.close();
+    }
+    
+    SqlSession sqlSession2 = sqlSessionFactory.openSession(true);
+    try {
+      PersonMapper pm = sqlSession2.getMapper(PersonMapper.class);
+      pm.delete(1);
+    }
+    finally {
+      sqlSession2.close();
+    }
+    
+    SqlSession sqlSession3 = sqlSessionFactory.openSession(true);
+    try {
+      PersonMapper pm = sqlSession3.getMapper(PersonMapper.class);
+      Assert.assertEquals(1, pm.findAll().size());
+    }
+    finally {
+      sqlSession3.close();
+    }
+  }
 
 }

src/test/java/org/apache/ibatis/submitted/cache/CreateDB.sql

@@ -14,7 +14,7 @@
 --    limitations under the License.
 --
 
-drop table person;
+drop table person if exists;
 
 create table person(
 	id int,