fix: 커넥션이 중간에 close되는 문제 해결

woowacourse · Oct 10, 2023 · 931503f · 931503f
1 parent 2bfb86c
commit 931503f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementExecutor.java b/jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementExecutor.java
@@ -24,12 +24,8 @@ public <T> T execute(
             final String sql,
             final Object... args
     ) {
-        try (final Connection connection = DataSourceUtils.getConnection(dataSource)) {
-            return execute(connection, executeStrategy, sql, args);
-        } catch (SQLException e) {
-            log.error("exception : {}", e);
-            throw new RuntimeException(e);
-        }
+        final Connection connection = DataSourceUtils.getConnection(dataSource);
+        return execute(connection, executeStrategy, sql, args);
     }
 
     public <T> T execute(
@@ -47,6 +43,8 @@ public <T> T execute(
         } catch (SQLException e) {
             log.error("exception : {}", e);
             throw new RuntimeException(e);
+        } finally {
+            DataSourceUtils.releaseConnection(connection, dataSource);
         }
     }
 

diff --git a/jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java b/jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
@@ -29,6 +29,10 @@ public static Connection getConnection(DataSource dataSource) throws CannotGetJd
 
     public static void releaseConnection(Connection connection, DataSource dataSource) {
         try {
+            if (!connection.getAutoCommit()) {
+                return;
+            }
+
             TransactionSynchronizationManager.unbindResource(dataSource);
             connection.close();
         } catch (SQLException ex) {

diff --git a/jdbc/src/main/java/org/springframework/transaction/support/TransactionExecutor.java b/jdbc/src/main/java/org/springframework/transaction/support/TransactionExecutor.java
@@ -23,7 +23,7 @@ public <T> T execute(final TransactionExecuteStrategy<T> executeStrategy) {
         final Connection connection = DataSourceUtils.getConnection(dataSource);
 
         try {
-            connection.setAutoCommit(false);
+            setAutoCommit(connection, false);
 
             final T result = executeStrategy.strategy();
 
@@ -35,6 +35,7 @@ public <T> T execute(final TransactionExecuteStrategy<T> executeStrategy) {
             rollback(connection);
             throw new DataAccessException(e);
         } finally {
+            setAutoCommit(connection, true);
             DataSourceUtils.releaseConnection(connection, dataSource);
         }
     }
@@ -47,4 +48,12 @@ public void rollback(final Connection connection) {
             throw new DataAccessException(e);
         }
     }
+
+    private void setAutoCommit(final Connection connection, final boolean status) {
+        try {
+            connection.setAutoCommit(status);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }