github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-23 12:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

#18 - SpringJdbcTransactionManager inifinite recursion (Ebean #1254)

Browse Source
This commit is contained in:
Rob Bygrave
2018-02-09 23:05:27 +13:00
parent 2f66e07c25
commit c2ddc70565
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -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>
src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java
+2 -2
View File
@@ -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");