diff --git a/pom.xml b/pom.xml index b997bb5a2..02a6badb0 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ io.ebean ebean - 11.10.1 + 11.10.3-SNAPSHOT provided diff --git a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 09c3ecfc4..30dd6ae88 100644 --- a/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -70,8 +70,8 @@ public class SpringJdbcTransactionManager implements ExternalTransactionManager if (holder == null || !holder.isSynchronizedWithTransaction()) { // no current Spring transaction - SpiTransaction currentEbeanTransaction = transactionManager.get(); - if (currentEbeanTransaction != null) { // this is unexpected + SpiTransaction currentEbeanTransaction = transactionManager.getInScope(); + if (currentEbeanTransaction != null && currentEbeanTransaction.isActive()) { // this is unexpected log.warn("No current Spring transaction BUT using current Ebean one {}", currentEbeanTransaction.getId()); } else { log.trace("No current Spring transaction");