fix for http://code.google.com/p/mybatis/issues/detail?id=206

Author: emacarron

src/main/java/org/apache/ibatis/session/SqlSessionManager.java

@@ -233,24 +233,28 @@ public void close() {
   }
 
   private class SqlSessionInterceptor implements InvocationHandler {
-      public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        final SqlSession sqlSesson = SqlSessionManager.this.localSqlSession.get();
-        if (sqlSesson != null) {
-          return method.invoke(sqlSesson, args);
-        } else {
-          final SqlSession autoSqlSession = openSession();
-          try {
-            final Object result = method.invoke(autoSqlSession, args);
-            autoSqlSession.commit();
-            return result;
-          } catch (Throwable t) {
-            autoSqlSession.rollback();
-            throw ExceptionUtil.unwrapThrowable(t);
-          } finally {
-            autoSqlSession.close();
-          }
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+      final SqlSession sqlSession = SqlSessionManager.this.localSqlSession.get();
+      if (sqlSession != null) {
+        try {
+          return method.invoke(sqlSession, args);
+        } catch (Throwable t) {
+          throw ExceptionUtil.unwrapThrowable(t);
+        }
+      } else {
+        final SqlSession autoSqlSession = openSession();
+        try {
+          final Object result = method.invoke(autoSqlSession, args);
+          autoSqlSession.commit();
+          return result;
+        } catch (Throwable t) {
+          autoSqlSession.rollback();
+          throw ExceptionUtil.unwrapThrowable(t);
+        } finally {
+          autoSqlSession.close();
         }
       }
     }
+  }
 
 }

src/test/java/org/apache/ibatis/session/SqlSessionManagerTest.java

@@ -5,6 +5,7 @@
 import domain.blog.mappers.BlogMapper;
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.cache.impl.PerpetualCache;
+import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.io.Resources;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -17,8 +18,6 @@
 import java.util.Map;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 public class SqlSessionManagerTest extends BaseDataTest {
 
@@ -250,8 +249,21 @@ public void shouldThrowExceptionIfMappedStatementDoesNotExist() throws Exception
     try {
       manager.selectList("ThisStatementDoesNotExist");
       fail("Expected exception to be thrown due to statement that does not exist.");
-    } catch (Exception e) {
+    } catch (PersistenceException e) {
+      assertTrue(e.getMessage().contains("does not contain value for ThisStatementDoesNotExist"));
+    }
+  }
+
+  @Test
+  public void shouldThrowExceptionIfMappedStatementDoesNotExistAndSqlSessionIsOpen() throws Exception {
+    try {
+      manager.startManagedSession();
+      manager.selectList("ThisStatementDoesNotExist");
+      fail("Expected exception to be thrown due to statement that does not exist.");
+    } catch (PersistenceException e) {
       assertTrue(e.getMessage().contains("does not contain value for ThisStatementDoesNotExist"));
+    } finally {
+      manager.close();
     }
   }