diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 0139c9b57..ff818e9cf 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -2235,6 +2235,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } catch (RuntimeException e) { wrap.endIfCreated(); throw e; + } finally { + wrap.clearIfCreated(); } } diff --git a/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java b/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java index abe332ac5..dd2115581 100644 --- a/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java +++ b/src/main/java/io/ebeaninternal/server/core/ObtainedTransaction.java @@ -41,4 +41,7 @@ class ObtainedTransaction { // do nothing } + public void clearIfCreated() { + // do nothing + } } diff --git a/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java b/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java index 7d86156a5..c4e06d434 100644 --- a/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java +++ b/src/main/java/io/ebeaninternal/server/core/ObtainedTransactionImplicit.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.EbeanServer; +import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiTransaction; /** @@ -11,12 +11,12 @@ import io.ebeaninternal.api.SpiTransaction; */ final class ObtainedTransactionImplicit extends ObtainedTransaction { - private final EbeanServer server; + private final SpiEbeanServer server; /** * Wrap the transaction indicating if it was just created. */ - ObtainedTransactionImplicit(SpiTransaction t, EbeanServer server) { + ObtainedTransactionImplicit(SpiTransaction t, SpiEbeanServer server) { super(t); this.server = server; } @@ -31,4 +31,9 @@ final class ObtainedTransactionImplicit extends ObtainedTransaction { server.endTransaction(); } + @Override + public void clearIfCreated() { + server.clearServerTransaction(); + } + } diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 7f6bb858f..9fa93e693 100644 --- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -350,6 +350,10 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery public void endTransIfRequired() { if (createdTransaction && transaction.isActive()) { transaction.commit(); + if (query.getType().isUpdate()) { + // for implicit update/delete queries clear the thread local + ebeanServer.clearServerTransaction(); + } } }