Skip to content

Improve transaction state detection logic #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improve transaction state detection logic #1144

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87b2328
Improve transaction state detection logic
wanggang1111111 Nov 11, 2025
8d2f6b2
Improve transaction state detection logic
hazendaz Nov 8, 2025
c05452a
Merge remote-tracking branch 'origin/master'
wanggang1111111 Nov 11, 2025
6285590
Test GPG signing
wanggang1111111 Nov 12, 2025
0426aa3
Improve transaction state detection logic
wanggang1111111 Nov 12, 2025
4230448
Improve transaction state detection logic
wanggang1111111 Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/org/mybatis/spring/transaction/SpringManagedTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,19 @@ public Connection getConnection() throws SQLException {
* connection or let it to Spring.
* <p>
* It also reads autocommit setting because when using Spring Transaction MyBatis thinks that autocommit is always
* false and will always call commit/rollback so we need to no-op that calls.
* false and will always call commit/rollback so we need to no-op that calls.:q
*/
private void openConnection() throws SQLException {
this.connection = DataSourceUtils.getConnection(this.dataSource);
this.autoCommit = this.connection.getAutoCommit();
this.isConnectionTransactional = DataSourceUtils.isConnectionTransactional(this.connection, this.dataSource);

boolean isInActiveTransaction = TransactionSynchronizationManager.isActualTransactionActive();
this.isConnectionTransactional = isInActiveTransaction &&
DataSourceUtils.isConnectionTransactional(this.connection, this.dataSource);

LOGGER.debug(() -> "JDBC Connection [" + this.connection + "] will"
+ (this.isConnectionTransactional ? " " : " not ") + "be managed by Spring");
+ (this.isConnectionTransactional ? " " : " not ") + "be managed by Spring");
}

@Override
public void commit() throws SQLException {
if (this.connection != null && !this.isConnectionTransactional && !this.autoCommit) {
Expand Down