From 4e20cdeb43bcadc029ebc976730af513542380c3 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 18 Apr 2024 12:16:33 +0200 Subject: [PATCH] Expand comment on participation in existing transaction Closes gh-32659 --- .../reactive/AbstractReactiveTransactionManager.java | 8 +++++--- .../support/AbstractPlatformTransactionManager.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) 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 d29b380b0f..6efe444555 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 @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,11 +234,13 @@ public abstract class AbstractReactiveTransactionManager prepareSynchronization(synchronizationManager, status, definition)).thenReturn(status); } - // Assumably PROPAGATION_SUPPORTS or PROPAGATION_REQUIRED. + // PROPAGATION_REQUIRED, PROPAGATION_SUPPORTS, PROPAGATION_MANDATORY: + // regular participation in existing transaction. if (debugEnabled) { logger.debug("Participating in existing transaction"); } - return Mono.just(prepareReactiveTransaction(synchronizationManager, definition, transaction, false, debugEnabled, null)); + return Mono.just(prepareReactiveTransaction( + synchronizationManager, definition, transaction, false, debugEnabled, null)); } /** diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 0ada2671fb..8da5bab118 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -491,7 +491,8 @@ public abstract class AbstractPlatformTransactionManager } } - // Assumably PROPAGATION_SUPPORTS or PROPAGATION_REQUIRED. + // PROPAGATION_REQUIRED, PROPAGATION_SUPPORTS, PROPAGATION_MANDATORY: + // regular participation in existing transaction. if (debugEnabled) { logger.debug("Participating in existing transaction"); }