From 73b2cc55f358cc81bb274c745796e1fb7ee7b3d9 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 9 Feb 2018 22:22:08 +1300 Subject: [PATCH] #1254 - SpringJdbcTransactionManager inifinite recursion #1254 Fix. Note tested in ebean-spring-txn. --- .../ExternalTransactionScopeManager.java | 38 +------------------ 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java index c9701dc16..a80ba0852 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java @@ -1,12 +1,11 @@ package io.ebeaninternal.server.transaction; import io.ebean.config.ExternalTransactionManager; -import io.ebeaninternal.api.SpiTransaction; /** * A TransactionScopeManager aware of external transaction managers. */ -public class ExternalTransactionScopeManager extends TransactionScopeManager { +public class ExternalTransactionScopeManager extends DefaultTransactionScopeManager { private final ExternalTransactionManager externalManager; @@ -23,39 +22,4 @@ public class ExternalTransactionScopeManager extends TransactionScopeManager { externalManager.setTransactionManager(manager); } - @Override - public void commit() { - DefaultTransactionThreadLocal.commit(serverName); - } - - - @Override - public void end() { - DefaultTransactionThreadLocal.end(serverName); - } - - @Override - public SpiTransaction getMaybeInactive() { - return get(); - } - - @Override - public SpiTransaction get() { - return (SpiTransaction) externalManager.getCurrentTransaction(); - } - - @Override - public void replace(SpiTransaction trans) { - DefaultTransactionThreadLocal.replace(serverName, trans); - } - - @Override - public void rollback() { - DefaultTransactionThreadLocal.rollback(serverName); - } - - @Override - public void set(SpiTransaction trans) { - DefaultTransactionThreadLocal.set(serverName, trans); - } }