diff --git a/pom.xml b/pom.xml index 4715f2d84..3fd94712e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ Ebean support for Spring transactions - 5.3.22 + 5.3.18 2.7.3 false diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 409d751b5..8375acf7c 100644 --- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -7,7 +7,6 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.transaction.TransactionManager; import org.springframework.jdbc.datasource.ConnectionHolder; import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; import javax.persistence.PersistenceException; @@ -91,12 +90,10 @@ public final class SpringJdbcTransactionManager implements ExternalTransactionMa private SpringTxnListener listener() { if (TransactionSynchronizationManager.isSynchronizationActive()) { List synchronizations = TransactionSynchronizationManager.getSynchronizations(); - if (synchronizations != null) { - // search for our specific listener - for (TransactionSynchronization synchronization : synchronizations) { - if (synchronization instanceof SpringTxnListener) { - return (SpringTxnListener) synchronization; - } + // search for our specific listener + for (TransactionSynchronization synchronization : synchronizations) { + if (synchronization instanceof SpringTxnListener) { + return (SpringTxnListener) synchronization; } } } @@ -117,7 +114,7 @@ public final class SpringJdbcTransactionManager implements ExternalTransactionMa * When Ebean is notified (of the commit/rollback) it can then manage its cache, notify * BeanPersistListeners etc. */ - private static class SpringTxnListener extends TransactionSynchronizationAdapter { + private static class SpringTxnListener implements TransactionSynchronization { private final TransactionManager transactionManager;