From c2ddc705655531380c5374e572d471e474b06073 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 9 Feb 2018 23:05:27 +1300
Subject: [PATCH] #18 - SpringJdbcTransactionManager inifinite recursion (Ebean
 #1254)

---
 pom.xml                                                       | 2 +-
 .../io/ebean/spring/txn/SpringJdbcTransactionManager.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b997bb5a2..02a6badb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean</artifactId>
-      <version>11.10.1</version>
+      <version>11.10.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
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");