github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-21 17:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3147 from FOCONIS/rethrow-error-in-commit

Browse Source 
FIX: Rethrow error in commit path of callbacks
This commit is contained in:
Rob Bygrave
2023-08-14 23:25:04 +12:00
committed by GitHub
parent d58e3d023f 4b2976e31b
commit 1decbe0152
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java
+13 -4
View File
@@ -190,7 +190,6 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
}
@Override
public final void setAutoPersistUpdates(boolean autoPersistUpdates) {
this.autoPersistUpdates = autoPersistUpdates;
@@ -251,7 +250,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
callbackList.add(callback);
}
private void withEachCallback(Consumer<TransactionCallback> consumer) {
private void withEachCallbackFailSilent(Consumer<TransactionCallback> consumer) {
if (callbackList != null) {
// using old style loop to cater for case when new callbacks are added recursively (as otherwise iterator fails fast)
for (int i = 0; i < callbackList.size(); i++) {
@@ -259,17 +258,27 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
consumer.accept(callbackList.get(i));
} catch (Exception e) {
log.log(ERROR, "Error executing transaction callback", e);
throw wrapIfNeeded(e);
}
}
}
}
private void withEachCallback(Consumer<TransactionCallback> consumer) {
if (callbackList != null) {
// using old style loop to cater for case when new callbacks are added recursively (as otherwise iterator fails fast)
for (int i = 0; i < callbackList.size(); i++) {
consumer.accept(callbackList.get(i));
}
}
}
private void firePreRollback() {
withEachCallback(TransactionCallback::preRollback);
withEachCallbackFailSilent(TransactionCallback::preRollback);
}
private void firePostRollback() {
withEachCallback(TransactionCallback::postRollback);
withEachCallbackFailSilent(TransactionCallback::postRollback);
if (changeLogHolder != null) {
changeLogHolder.postRollback();
}