diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java index 52ab39b184..9c6391256f 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/AbstractReactiveTransactionManager.java @@ -101,7 +101,7 @@ public abstract class AbstractReactiveTransactionManager implements ReactiveTran // Use defaults if no transaction definition given. TransactionDefinition def = (definition != null ? definition : TransactionDefinition.withDefaults()); - return TransactionSynchronizationManager.currentTransaction() + return TransactionSynchronizationManager.forCurrentTransaction() .flatMap(synchronizationManager -> { Object transaction = doGetTransaction(synchronizationManager); @@ -403,7 +403,7 @@ public abstract class AbstractReactiveTransactionManager implements ReactiveTran "Transaction is already completed - do not call commit or rollback more than once per transaction")); } - return TransactionSynchronizationManager.currentTransaction().flatMap(synchronizationManager -> { + return TransactionSynchronizationManager.forCurrentTransaction().flatMap(synchronizationManager -> { GenericReactiveTransaction reactiveTx = (GenericReactiveTransaction) transaction; if (reactiveTx.isRollbackOnly()) { if (reactiveTx.isDebug()) { @@ -483,7 +483,7 @@ public abstract class AbstractReactiveTransactionManager implements ReactiveTran return Mono.error(new IllegalTransactionStateException( "Transaction is already completed - do not call commit or rollback more than once per transaction")); } - return TransactionSynchronizationManager.currentTransaction().flatMap(synchronizationManager -> { + return TransactionSynchronizationManager.forCurrentTransaction().flatMap(synchronizationManager -> { GenericReactiveTransaction reactiveTx = (GenericReactiveTransaction) transaction; return processRollback(synchronizationManager, reactiveTx); }); diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java index b082b32dd3..4ac960cfdb 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java @@ -82,13 +82,13 @@ public class TransactionSynchronizationManager { /** - * Return the TransactionSynchronizationManager of the current transaction. - * Mainly intended for code that wants to bind resources or synchronizations. - * rollback-only but not throw an application exception. - * @throws NoTransactionException if the transaction info cannot be found, - * because the method was invoked outside a managed transaction. + * Get the {@link TransactionSynchronizationManager} that is associated with + * the current transaction context. + *
Mainly intended for code that wants to bind resources or synchronizations.
+ * @throws NoTransactionException if the transaction info cannot be found —
+ * for example, because the method was invoked outside a managed transaction
*/
- public static Mono