FIX: Transaction was not really created

ebean-orm · Dec 8, 2023 · e45e87f · e45e87f
1 parent ecdf8bd
commit e45e87f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -587,6 +587,7 @@ private TxScope initTxScope(TxScope txScope) {
   private boolean isCreateNewTransaction(SpiTransaction current, TxType type) {
     switch (type) {
       case REQUIRED:
+        return current == null || !current.isActive();
       case SUPPORTS:
         return current == null;
       case REQUIRES_NEW:

diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java
@@ -243,11 +243,15 @@ public void test_txn_with_not_supported() {
     try (Transaction txn1 = DB.beginTransaction()) {
       assertThat(getInScopeTransaction()).isNotNull();
       getInScopeTransaction().putUserObject("foo", "bar");
+      assertThat(Transaction.current()).isNotNull();
 
       try (Transaction txn2 = DB.beginTransaction(TxScope.notSupported())) {
         // pause txn1
+        assertThat(Transaction.current()).isNull();
+
         try (Transaction txn3 = DB.beginTransaction()) {
           // create a new Txn scope
+          assertThat(Transaction.current()).isNotNull();
           txn3.commit();
         }
         txn2.commit();