From 1db2e81f45218f653a008f87356187c94cd99a3e Mon Sep 17 00:00:00 2001 From: chenjh3 Date: Mon, 21 Aug 2023 16:45:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissue(https://gitee.com/mybat?= =?UTF-8?q?is-flex/mybatis-flex/issues/I7TZA1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mybatisflex/spring/FlexSpringTransaction.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java index c29d74b6..65ef9d39 100644 --- a/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java +++ b/mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java @@ -69,14 +69,14 @@ public class FlexSpringTransaction implements Transaction { @Override public void commit() throws SQLException { - if (!isTransaction && !autoCommit) { + if (isHoldConnection() && !isTransaction && !autoCommit) { getConnection().commit(); } } @Override public void rollback() throws SQLException { - if (!isTransaction && !autoCommit) { + if (isHoldConnection() && !isTransaction && !autoCommit) { getConnection().rollback(); } } @@ -90,4 +90,8 @@ public class FlexSpringTransaction implements Transaction { public Integer getTimeout() throws SQLException { return null; } + + private boolean isHoldConnection() { + return !connectionMap.isEmpty(); + } }