From 5ad9a611f949fb46ac8830c265a8b990f2bba8e7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 11 Jan 2017 22:41:22 +1300 Subject: [PATCH] #941 - @Transactional( type = TxType.MANDATORY ) creates a new transaction even if there is one available --- .../server/core/DefaultServer.java | 2 +- .../transaction/TestNestedMandatory.java | 48 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/tests/transaction/TestNestedMandatory.java diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 3aad7a84f..6c3ff080f 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -692,7 +692,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (t == null) { throw new PersistenceException("Transaction missing when MANDATORY"); } - return true; + return false; case NEVER: if (t != null) { diff --git a/src/test/java/org/tests/transaction/TestNestedMandatory.java b/src/test/java/org/tests/transaction/TestNestedMandatory.java new file mode 100644 index 000000000..99f5723d0 --- /dev/null +++ b/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -0,0 +1,48 @@ +package org.tests.transaction; + +import io.ebean.BaseTestCase; +import io.ebean.Ebean; +import io.ebean.Transaction; +import io.ebean.TxType; +import io.ebean.annotation.Transactional; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TestNestedMandatory extends BaseTestCase { + + private static final Logger log = LoggerFactory.getLogger(TestNestedMandatory.class); + + static Transaction outerTxn; + + @Test + public void test() { + + new Outer().doOuter(); + } + + class Outer { + + @Transactional + void doOuter() { + outerTxn = Ebean.currentTransaction(); + + log.info("outer start ...{}", outerTxn); + new Inner().doInner(); + log.info("outer end ...{}", outerTxn); + } + } + + class Inner { + + @Transactional(type = TxType.MANDATORY) + void doInner() { + Transaction innerTxn = Ebean.currentTransaction(); + log.info("inner ...{}", innerTxn); + + assertThat(innerTxn).isSameAs(outerTxn); + } + } +}