diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 9fae2e21c..4b8408c27 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -885,6 +885,9 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { public final void preCommit() { internalBatchFlush(); firePreCommit(); + // we must flush the batch queue again, because the callback can + // modify current transaction + internalBatchFlush(); } /** diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java index ce9e420b8..b306fef94 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java @@ -105,4 +105,25 @@ public class JdbcTransactionTest { assertThat(postCommitCallCount.get()).isEqualTo(2); // postcommit executed twice } } + + @Test + public void testFlushInCallback() { + try (Transaction transaction = DB.beginTransaction()) { + transaction.setBatchMode(true); + DB.currentTransaction().register( + new TransactionCallbackAdapter() { + + @Override + public void preCommit() { + EBasic basic = new EBasic("binner1"); + DB.save(basic); + } + } + ); + EBasic basic = new EBasic("bouter1"); + DB.save(basic); + transaction.commit(); // transaction will fail if recursive post-commit is failing + } + assertThat(DB.find(EBasic.class).where().eq("name", "binner1").exists()).isTrue(); + } }