root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing contribution 

See gh-24493
This commit is contained in:
Rossen Stoyanchev 2020-02-20 17:58:47 +00:00
parent a09f02f64e
commit adc13f2030
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.core.Constants; import org.springframework.core.Constants;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.transaction.IllegalTransactionStateException; import org.springframework.transaction.IllegalTransactionStateException;
import org.springframework.transaction.InvalidTimeoutException; 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); logger.debug("Creating new transaction with name [" + def.getName() + "]: " + def);
} }
try { try {
return openNewTransaction(def, transaction, debugEnabled, suspendedResources); return startTransaction(def, transaction, debugEnabled, suspendedResources);
} }
catch (RuntimeException | Error ex) { catch (RuntimeException | Error ex) {
resume(null, suspendedResources); 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 startTransaction(TransactionDefinition definition, Object transaction,
private TransactionStatus openNewTransaction(TransactionDefinition def, Object transaction,
boolean debugEnabled, @Nullable SuspendedResourcesHolder suspendedResources) { boolean debugEnabled, @Nullable SuspendedResourcesHolder suspendedResources) {
boolean newSynchronization = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER); boolean newSynchronization = (getTransactionSynchronization() != SYNCHRONIZATION_NEVER);
DefaultTransactionStatus status = newTransactionStatus( DefaultTransactionStatus status = newTransactionStatus(
def, transaction, true, newSynchronization, debugEnabled, suspendedResources); definition, transaction, true, newSynchronization, debugEnabled, suspendedResources);
doBegin(transaction, def); doBegin(transaction, definition);
prepareSynchronization(status, def); prepareSynchronization(status, definition);
return status; return status;
} }
@ -432,7 +431,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
} }
SuspendedResourcesHolder suspendedResources = suspend(transaction); SuspendedResourcesHolder suspendedResources = suspend(transaction);
try { try {
return openNewTransaction(definition, transaction, debugEnabled, suspendedResources); return startTransaction(definition, transaction, debugEnabled, suspendedResources);
} }
catch (RuntimeException | Error beginEx) { catch (RuntimeException | Error beginEx) {
resumeAfterBeginException(transaction, suspendedResources, beginEx); resumeAfterBeginException(transaction, suspendedResources, beginEx);
@ -462,7 +461,7 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran
// Nested transaction through nested begin and commit/rollback calls. // Nested transaction through nested begin and commit/rollback calls.
// Usually only for JTA: Spring synchronization might get activated here // Usually only for JTA: Spring synchronization might get activated here
// in case of a pre-existing JTA transaction. // in case of a pre-existing JTA transaction.
return openNewTransaction(definition, transaction, debugEnabled, null); return startTransaction(definition, transaction, debugEnabled, null);
} }
} }