From d517dea27f3f85c560fcab810a4369b3f9454946 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 1 Sep 2022 22:26:52 +1200 Subject: [PATCH] ENH: Add Transaction.rollbackAndContinue() --- .../main/java/io/ebeaninternal/api/ScopedTransaction.java | 5 +++++ .../io/ebeaninternal/server/transaction/NoTransaction.java | 6 +++++- .../server/transaction/SavepointTransaction.java | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 10fa49a13..6fb30ddde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -111,6 +111,11 @@ public final class ScopedTransaction extends SpiTransactionProxy { } } + @Override + public void rollbackAndContinue() { + transaction.rollbackAndContinue(); + } + @Override public void rollback() throws PersistenceException { try { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 529a7ca0a..ff094b643 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -78,10 +78,14 @@ final class NoTransaction implements SpiTransaction { } @Override - public void rollback() throws PersistenceException { + public void rollbackAndContinue() { // do nothing } + @Override + public void rollback() throws PersistenceException { + // do nothing + } @Override public void rollback(Throwable e) throws PersistenceException { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java index aa4bc978e..b170b71a2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java @@ -69,6 +69,11 @@ final class SavepointTransaction extends SpiTransactionProxy { } } + @Override + public void rollbackAndContinue() { + throw new UnsupportedOperationException(); + } + @Override public void rollback() throws PersistenceException { rollbackSavepoint(null);