Skip to content

Commit 1bf3e7c

Browse files
MottoXsnicoll
authored andcommitted
Fix typo
Closes gh-1545
1 parent 40ba95f commit 1bf3e7c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public final boolean isNestedTransactionAllowed() {
206206
* Set whether existing transactions should be validated before participating
207207
* in them.
208208
* <p>When participating in an existing transaction (e.g. with
209-
* PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing
209+
* PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing
210210
* transaction), this outer transaction's characteristics will apply even
211211
* to the inner transaction scope. Validation will detect incompatible
212212
* isolation level and read-only settings on the inner transaction definition
@@ -231,7 +231,7 @@ public final boolean isValidateExistingTransaction() {
231231
* Set whether to globally mark an existing transaction as rollback-only
232232
* after a participating transaction failed.
233233
* <p>Default is "true": If a participating transaction (e.g. with
234-
* PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing
234+
* PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing
235235
* transaction) fails, the transaction will be globally marked as rollback-only.
236236
* The only possible outcome of such a transaction is a rollback: The
237237
* transaction originator <i>cannot</i> make the transaction commit anymore.

spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ public static void setActualTransactionActive(boolean active) {
443443
* between active transaction synchronization (with or without backing
444444
* resource transaction; also on PROPAGATION_SUPPORTS) and an actual
445445
* transaction being active (with backing resource transaction;
446-
* on PROPAGATION_REQUIRES, PROPAGATION_REQUIRES_NEW, etc).
446+
* on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc).
447447
* @see #isSynchronizationActive()
448448
*/
449449
public static boolean isActualTransactionActive() {

0 commit comments

Comments
 (0)