添加 closeOnException，避免极端情况下 connection.close() 调用两次

jfinal · jfinal · commit a79c0311ca59 · 2025-05-23T16:44:15.000+08:00
diff --git a/src/main/java/com/jfinal/plugin/activerecord/TransactionExecutor.java b/src/main/java/com/jfinal/plugin/activerecord/TransactionExecutor.java
@@ -93,6 +93,7 @@ public <R> R execute(Config config, int isolation, TransactionAtom<R> atom) {
             throw e instanceof RuntimeException ? (RuntimeException) e : new ActiveRecordException(e);
 
         } finally {
+            boolean closeOnException = true;
             try {
                 if (conn != null) {
                     if (originalAutoCommit != null) {
@@ -104,10 +105,20 @@ public <R> R execute(Config config, int isolation, TransactionAtom<R> atom) {
                         conn.setTransactionIsolation(originalIsolation);
                     }
 
+                    closeOnException = false;
                     conn.close();
                 }
+
             } catch (Exception e) {
+                if (conn != null && closeOnException) {
+                    try {
+                        conn.close();
+                    } catch (Exception e1) {
+                        log.error(e1.getMessage(), e1);
+                    }
+                }
                 log.error(e.getMessage(), e);
+
             } finally {
                 config.removeThreadLocalConnection();
                 config.removeThreadLocalTransaction();
