From adc13f203030d56dc5e0ed870879f0814cd68a53 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 20 Feb 2020 17:58:47 +0000 Subject: [PATCH] Polishing contribution See gh-24493 --- .../AbstractPlatformTransactionManager.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 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 c27156a33c..3617ca8c48 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 @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.Constants; -import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.transaction.IllegalTransactionStateException; import org.springframework.transaction.InvalidTimeoutException; @@ -371,7 +370,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran logger.debug("Creating new transaction with name [" + def.getName() + "]: " + def); } try { - return openNewTransaction(def, transaction, debugEnabled, suspendedResources); + return startTransaction(def, transaction, debugEnabled, suspendedResources); } catch (RuntimeException | Error ex) { resume(null, suspendedResources); @@ -390,16 +389,16 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran } /** - * Open a new transaction with transaction definition. + * Start a new transaction. */ - @NonNull - private TransactionStatus openNewTransaction(TransactionDefinition def, Object transaction, + private TransactionStatus startTransaction(TransactionDefinition definition, Object transaction, boolean debugEnabled, @Nullable SuspendedResourcesHolder suspendedResources) { + boolean newSynchronization = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER); DefaultTransactionStatus status = newTransactionStatus( - def, transaction, true, newSynchronization, debugEnabled, suspendedResources); - doBegin(transaction, def); - prepareSynchronization(status, def); + definition, transaction, true, newSynchronization, debugEnabled, suspendedResources); + doBegin(transaction, definition); + prepareSynchronization(status, definition); return status; } @@ -432,7 +431,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran } SuspendedResourcesHolder suspendedResources = suspend(transaction); try { - return openNewTransaction(definition, transaction, debugEnabled, suspendedResources); + return startTransaction(definition, transaction, debugEnabled, suspendedResources); } catch (RuntimeException | Error beginEx) { resumeAfterBeginException(transaction, suspendedResources, beginEx); @@ -462,7 +461,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran // Nested transaction through nested begin and commit/rollback calls. // Usually only for JTA: Spring synchronization might get activated here // in case of a pre-existing JTA transaction. - return openNewTransaction(definition, transaction, debugEnabled, null); + return startTransaction(definition, transaction, debugEnabled, null); } }