diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index fcac89aa6..ead75c2f4 100644 --- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -49,7 +49,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager */ @Override public void setTransactionManager(Object txnMgr) { - // RB: At this stage not exposing TransactionManager to // the public API and hence the Object type and casting here this.transactionManager = (TransactionManager) txnMgr; @@ -64,10 +63,8 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager */ @Override public Object getCurrentTransaction() { - // Get the current Spring ConnectionHolder associated to the current spring managed transaction ConnectionHolder holder = (ConnectionHolder) TransactionSynchronizationManager.getResource(dataSource); - if (holder == null || !holder.isSynchronizedWithTransaction()) { // no current Spring transaction SpiTransaction currentEbeanTransaction = transactionManager.getInScope(); @@ -90,7 +87,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager // Create and register a Spring TransactionSynchronization for this transaction springTxnLister = createSpringTxnListener(newTrans); TransactionSynchronizationManager.registerSynchronization(springTxnLister); - return transactionManager.externalBeginTransaction(newTrans, TxScope.required()); } } @@ -102,7 +98,6 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager *
*/ private SpringTxnListener getSpringTxnListener() { - if (TransactionSynchronizationManager.isSynchronizationActive()) { List