Merge pull request #220 from domaframework/issue-219

Fix broken local transaction

Author: nakamura-to

src/main/java/org/seasar/doma/jdbc/tx/LocalTransaction.java

@@ -202,8 +202,8 @@ protected void beginInternal(
             throw new TransactionAlreadyBegunException(id);
         }
         context = getLocalTransactionContext();
-        context.begin((connection) -> {
-            assertNotNull(connection);
+        context.begin(() -> {
+            Connection connection = JdbcUtil.getConnection(dataSource);
             int transactionIsolation;
             try {
                 transactionIsolation = connection.getTransactionIsolation();
@@ -241,9 +241,7 @@ protected void beginInternal(
      * @return ローカルトランザクションコンテキスト
      */
     protected LocalTransactionContext getLocalTransactionContext() {
-        LocalTransactionContext context = new LocalTransactionContext(() -> {
-            return JdbcUtil.getConnection(dataSource);
-        });
+        LocalTransactionContext context = new LocalTransactionContext();
         localTxContextHolder.set(context);
         return context;
     }

src/main/java/org/seasar/doma/jdbc/tx/LocalTransactionContext.java

@@ -17,13 +17,11 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
-import java.sql.Connection;
 import java.sql.Savepoint;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.seasar.doma.message.Message;
@@ -38,50 +36,37 @@ public class LocalTransactionContext {
 
     private final Map<String, Savepoint> savepointMap = new HashMap<String, Savepoint>();
 
-    private final Supplier<Connection> connectionSupplier;
-
-    private Connection connection;
-
     private LocalTransactionConnection localTxConnection;
 
-    private Function<Connection, LocalTransactionConnection> connectionInitializer;
+    private Supplier<LocalTransactionConnection> localTxConnectionSupplier;
 
     private String id;
 
     private boolean rollbackOnly;
 
-    LocalTransactionContext(Supplier<Connection> connectionSupplier) {
-        assertNotNull(connectionSupplier);
-        this.connectionSupplier = connectionSupplier;
-    }
-
-    void begin(
-            Function<Connection, LocalTransactionConnection> connectionInitializer) {
-        assertNotNull(connectionInitializer);
-        id = String.valueOf(System.identityHashCode(connectionInitializer));
-        this.connectionInitializer = connectionInitializer;
+    void begin(Supplier<LocalTransactionConnection> localTxConnectionSupplier) {
+        assertNotNull(localTxConnectionSupplier);
+        id = String.valueOf(System.identityHashCode(localTxConnectionSupplier));
+        this.localTxConnectionSupplier = localTxConnectionSupplier;
     }
 
     void end() {
         id = null;
-        connectionInitializer = null;
+        localTxConnectionSupplier = null;
     }
 
     LocalTransactionConnection getConnection() {
         if (localTxConnection == null) {
-            if (connection == null) {
-                connection = connectionSupplier.get();
-            }
-            if (connectionInitializer == null) {
+            if (localTxConnectionSupplier == null) {
                 throw new TransactionNotYetBegunException(Message.DOMA2048);
             }
-            localTxConnection = connectionInitializer.apply(connection);
+            localTxConnection = localTxConnectionSupplier.get();
         }
         return localTxConnection;
     }
 
     boolean hasConnection() {
-        return connection != null;
+        return localTxConnection != null;
     }
 
     Savepoint getSavepoint(String savepointName) {

src/test/java/org/seasar/doma/jdbc/tx/LocalTransactionContextTest.java

@@ -19,10 +19,10 @@
 import java.sql.SQLException;
 import java.sql.Savepoint;
 
-import junit.framework.TestCase;
-
 import org.seasar.doma.internal.jdbc.mock.MockConnection;
 
+import junit.framework.TestCase;
+
 /**
  * @author taedium
  * 
@@ -32,8 +32,7 @@ public class LocalTransactionContextTest extends TestCase {
     public void testReleaseAndGetSavepoint() throws Exception {
         try (LocalTransactionConnection connection = new LocalTransactionConnection(
                 new MockConnection(), Connection.TRANSACTION_READ_COMMITTED)) {
-            LocalTransactionContext context = new LocalTransactionContext(
-                    () -> connection);
+            LocalTransactionContext context = new LocalTransactionContext();
             context.addSavepoint("1", new MySavepoint("1"));
             context.addSavepoint("2", new MySavepoint("2"));
             context.addSavepoint("3", new MySavepoint("3"));