From d9c0151d41eaa7975bf21dba0009043386ae3bed Mon Sep 17 00:00:00 2001 From: Robin Wang Date: Sun, 1 Oct 2017 00:41:42 +0800 Subject: [PATCH] Fix typo Closes gh-1545 --- .../support/AbstractPlatformTransactionManager.java | 4 ++-- .../support/TransactionSynchronizationManager.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 b9cbfe6d87e..bad94b05be4 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 @@ -207,7 +207,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran * Set whether existing transactions should be validated before participating * in them. *

When participating in an existing transaction (e.g. with - * PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing + * PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing * transaction), this outer transaction's characteristics will apply even * to the inner transaction scope. Validation will detect incompatible * isolation level and read-only settings on the inner transaction definition @@ -232,7 +232,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran * Set whether to globally mark an existing transaction as rollback-only * after a participating transaction failed. *

Default is "true": If a participating transaction (e.g. with - * PROPAGATION_REQUIRES or PROPAGATION_SUPPORTS encountering an existing + * PROPAGATION_REQUIRED or PROPAGATION_SUPPORTS encountering an existing * transaction) fails, the transaction will be globally marked as rollback-only. * The only possible outcome of such a transaction is a rollback: The * transaction originator cannot make the transaction commit anymore. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java index b705fc00c01..b17a08ddd2c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java @@ -450,7 +450,7 @@ public abstract class TransactionSynchronizationManager { * between active transaction synchronization (with or without backing * resource transaction; also on PROPAGATION_SUPPORTS) and an actual * transaction being active (with backing resource transaction; - * on PROPAGATION_REQUIRES, PROPAGATION_REQUIRES_NEW, etc). + * on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc). * @see #isSynchronizationActive() */ public static boolean isActualTransactionActive() {