Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore auto-commit mode if not done by driver

Browse Source 
Closes gh-31268
This commit is contained in:
Juergen Hoeller
2023-09-29 14:57:17 +02:00
parent 9aab4a60f5
commit 847e8a2b23
2 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
View File

@@ -209,7 +209,7 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager
connectionMono = Mono.just(txObject.getConnectionHolder().getConnection());
}
return connectionMono.flatMap(con -> doBegin(definition, con)
return connectionMono.flatMap(con -> doBegin(con, txObject, definition)
.then(prepareTransactionalConnection(con, definition))
.doOnSuccess(v -> {
txObject.getConnectionHolder().setTransactionActive(true);
@@ -233,7 +233,10 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager
}).then();
}
private Mono<Void> doBegin(TransactionDefinition definition, Connection con) {
private Mono<Void> doBegin(
Connection con, ConnectionFactoryTransactionObject transaction, TransactionDefinition definition) {
transaction.setMustRestoreAutoCommit(con.isAutoCommit());
io.r2dbc.spi.TransactionDefinition transactionDefinition = createTransactionDefinition(definition);
if (logger.isDebugEnabled()) {
logger.debug("Starting R2DBC transaction on Connection [" + con + "] using [" + transactionDefinition + "]");
@@ -354,12 +357,22 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager
if (logger.isDebugEnabled()) {
logger.debug("Releasing R2DBC Connection [" + con + "] after transaction");
}
Mono<Void> restoreMono = Mono.empty();
if (txObject.isMustRestoreAutoCommit() && !con.isAutoCommit()) {
restoreMono = Mono.from(con.setAutoCommit(true));
if (logger.isDebugEnabled()) {
restoreMono = restoreMono.doOnError(ex ->
logger.debug(String.format("Error ignored during auto-commit restore: %s", ex)));
}
restoreMono = restoreMono.onErrorComplete();
}
Mono<Void> releaseMono = ConnectionFactoryUtils.releaseConnection(con, obtainConnectionFactory());
if (logger.isDebugEnabled()) {
releaseMono = releaseMono.doOnError(
ex -> logger.debug(String.format("Error ignored during cleanup: %s", ex)));
releaseMono = releaseMono.doOnError(ex ->
logger.debug(String.format("Error ignored during connection release: %s", ex)));
}
return releaseMono.onErrorComplete();
releaseMono = releaseMono.onErrorComplete();
return restoreMono.then(releaseMono);
}
}
finally {
@@ -482,6 +495,8 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager
private boolean newConnectionHolder;
private boolean mustRestoreAutoCommit;
@Nullable
private String savepointName;
@@ -507,6 +522,14 @@ public class R2dbcTransactionManager extends AbstractReactiveTransactionManager
return (this.connectionHolder != null);
}
public void setMustRestoreAutoCommit(boolean mustRestoreAutoCommit) {
this.mustRestoreAutoCommit = mustRestoreAutoCommit;
}
public boolean isMustRestoreAutoCommit() {
return this.mustRestoreAutoCommit;
}
public boolean isTransactionActive() {
return (this.connectionHolder != null && this.connectionHolder.isTransactionActive());
}