defer throwing an exception from beforeCompletion synchs

mmusgrov · Nov 13, 2023 · d80b30e · d80b30e
1 parent 5f5c644
commit d80b30e
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/...va/io/quarkus/narayana/jta/runtime/internal/tsr/AgroalOrderedLastSynchronizationList.java b/...va/io/quarkus/narayana/jta/runtime/internal/tsr/AgroalOrderedLastSynchronizationList.java
@@ -60,6 +60,8 @@ public void add(Synchronization synchronization) {
 
         @Override
         public void beforeCompletion() {
+            Throwable deferredThrowable = null;
+
             status = ExecutionStatus.RUNNING;
 
             // Note that because synchronizations can register other synchronizations
@@ -75,29 +77,25 @@ public void beforeCompletion() {
                                 "The synchronization %s associated with tx key %s failed during beforeCompletion: %s",
                                 sync, tsr.getTransactionKey(), e.getMessage());
                     }
-                    throw e;
+
+                    if (deferredThrowable == null) {
+                        deferredThrowable = e;
+                    }
                 }
             }
 
             status = ExecutionStatus.FINISHED;
+
+            if (deferredThrowable != null) {
+                throw new RuntimeException(deferredThrowable);
+            }
         }
 
         @Override
         public void afterCompletion(int status) {
             // The list should be iterated in reverse order
             for (int i = synchs.size(); i-- > 0;) {
-                Synchronization sync = synchs.get(i);
-
-                try {
-                    sync.afterCompletion(status);
-                } catch (Exception e) {
-                    if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debugf(
-                                "The synchronization %s associated with tx key %s failed during afterCompletion(%d): %s",
-                                sync, tsr.getTransactionKey(), status, e.getMessage());
-                    }
-                    throw e;
-                }
+                synchs.get(i).afterCompletion(status);
             }
         }