[JDBC 라이브러리 구현하기 - 4단계] 이레(이다형) 미션 제출합니다.

jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java

@@ -1,6 +1,7 @@
 package org.springframework.jdbc.datasource;
 
 import org.springframework.jdbc.exception.CannotGetJdbcConnectionException;
+import org.springframework.transaction.support.ConnectionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.sql.DataSource;
@@ -13,24 +14,32 @@ public abstract class DataSourceUtils {
     private DataSourceUtils() {}
 
     public static Connection getConnection(final DataSource dataSource) throws CannotGetJdbcConnectionException {
-        Connection connection = TransactionSynchronizationManager.getResource(dataSource);
-        if (connection != null) {
-            return connection;
+        ConnectionHolder connectionHolder = TransactionSynchronizationManager.getResource(dataSource);
+        if (connectionHolder != null) {
+            return connectionHolder.getConnection();
         }
 
         try {
-            connection = dataSource.getConnection();
-            TransactionSynchronizationManager.bindResource(dataSource, connection);
+            Connection connection = dataSource.getConnection();
+            TransactionSynchronizationManager.bindResource(dataSource, new ConnectionHolder(connection));
             return connection;
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
         }
     }
 
     public static void releaseConnection(final Connection connection, final DataSource dataSource) {
+        if(connection == null) {
+            return;
+        }
+        ConnectionHolder connectionHolder = TransactionSynchronizationManager.getResource(dataSource);
+        boolean isConnectionActive = connectionHolder.isConnectionTransactionActive();
+        if(isConnectionActive) {
+            return;
+        }
         try {
-            connection.close();
             TransactionSynchronizationManager.unbindResource(dataSource);
+            connection.close();
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");
         }

jdbc/src/main/java/org/springframework/transaction/support/ConnectionHolder.java

@@ -0,0 +1,26 @@
+package org.springframework.transaction.support;
+
+import java.sql.Connection;
+
+public class ConnectionHolder {
+
+    private final Connection connection;
+
+    private boolean isConnectionTransactionActive;
+
+    public ConnectionHolder(final Connection connection) {
+        this.connection = connection;
+    }
+
+    public void setConnectionTransactionActive(boolean isActive) {
+        this.isConnectionTransactionActive = isActive;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public boolean isConnectionTransactionActive() {
+        return isConnectionTransactionActive;
+    }
+}

jdbc/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java

@@ -1,36 +1,35 @@
 package org.springframework.transaction.support;
 
 import javax.sql.DataSource;
-import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
 
 public abstract class TransactionSynchronizationManager {
 
-    private static final ThreadLocal<Map<DataSource, Connection>> resources = new ThreadLocal<>();
+    private static final ThreadLocal<Map<DataSource, ConnectionHolder>> resources = new ThreadLocal<>();
 
     private TransactionSynchronizationManager() {
     }
 
-    public static Connection getResource(DataSource key) {
-        Map<DataSource, Connection> map = resources.get();
+    public static ConnectionHolder getResource(DataSource key) {
+        Map<DataSource, ConnectionHolder> map = resources.get();
         if (map == null) {
             return null;
         }
         return map.getOrDefault(key, null);
     }
 
-    public static void bindResource(DataSource key, Connection value) {
-        Map<DataSource, Connection> map = resources.get();
+    public static void bindResource(DataSource key, ConnectionHolder value) {
+        Map<DataSource, ConnectionHolder> map = resources.get();
         if (map == null) {
             map = new HashMap<>();
             resources.set(map);
         }
         map.put(key, value);
     }
 
-    public static Connection unbindResource(DataSource key) {
-        Map<DataSource, Connection> map = resources.get();
+    public static ConnectionHolder unbindResource(DataSource key) {
+        Map<DataSource, ConnectionHolder> map = resources.get();
         if (map == null || !map.containsKey(key)) {
             return null;
         }