Skip to content

Commit 30d1b53

Browse files
committed
Merge pull request #1545 from MottoX:fix-typo
* pr/1545: Fix typo
2 parents cf86f9b + d9c0151 commit 30d1b53

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
@@ -207,7 +207,7 @@ public final boolean isNestedTransactionAllowed() {
207207
* Set whether existing transactions should be validated before participating
208208
* in them.
209209
* <p>When participating in an existing transaction (e.g. with
210-
* PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing
210+
* PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing
211211
* transaction), this outer transaction's characteristics will apply even
212212
* to the inner transaction scope. Validation will detect incompatible
213213
* isolation level and read-only settings on the inner transaction definition
@@ -232,7 +232,7 @@ public final boolean isValidateExistingTransaction() {
232232
* Set whether to globally mark an existing transaction as rollback-only
233233
* after a participating transaction failed.
234234
* <p>Default is "true": If a participating transaction (e.g. with
235-
* PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing
235+
* PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing
236236
* transaction) fails, the transaction will be globally marked as rollback-only.
237237
* The only possible outcome of such a transaction is a rollback: The
238238
* 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
@@ -450,7 +450,7 @@ public static void setActualTransactionActive(boolean active) {
450450
* between active transaction synchronization (with or without backing
451451
* resource transaction; also on PROPAGATION_SUPPORTS) and an actual
452452
* transaction being active (with backing resource transaction;
453-
* on PROPAGATION_REQUIRES, PROPAGATION_REQUIRES_NEW, etc).
453+
* on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc).
454454
* @see #isSynchronizationActive()
455455
*/
456456
public static boolean isActualTransactionActive() {

0 commit comments

Comments
 (0)