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

Fix doCleanupAfterCompletion invocation

Browse Source 
doCleanupAfterCompletion gets now subscribed to when processing
cleanup after a new transaction.
This commit is contained in:
Mark Paluch
2019-05-03 14:52:55 +02:00
committed by Juergen Hoeller
parent ec8689d1fc
commit 9cff07ce35
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java
View File

@@ -676,17 +676,18 @@ public abstract class AbstractReactiveTransactionManager implements ReactiveTran
if (status.isNewSynchronization()) {
synchronizationManager.clear();
}
Mono<Void> cleanup = Mono.empty();
if (status.isNewTransaction()) {
doCleanupAfterCompletion(synchronizationManager, status.getTransaction());
cleanup = doCleanupAfterCompletion(synchronizationManager, status.getTransaction());
}
if (status.getSuspendedResources() != null) {
if (status.isDebug()) {
logger.debug("Resuming suspended transaction after completion of inner transaction");
}
Object transaction = (status.hasTransaction() ? status.getTransaction() : null);
return resume(synchronizationManager, transaction, (SuspendedResourcesHolder) status.getSuspendedResources());
return cleanup.then(resume(synchronizationManager, transaction, (SuspendedResourcesHolder) status.getSuspendedResources()));
}
return Mono.empty();
return cleanup;
});
}