Rethrow a CommitFail exception upon auto-commit failure

xtclang · Feb 28, 2025 · cfc3fff · cfc3fff
1 parent 15679a4
commit cfc3fff
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib_oodb/src/main/x/oodb/Transaction.x b/lib_oodb/src/main/x/oodb/Transaction.x
@@ -188,7 +188,17 @@ interface Transaction<Schema extends RootSchema>
 
             if (e == Null && !rollbackOnly) {
                 try {
-                    commit();
+                    switch(CommitResult result = commit()) {
+                    case RollbackOnly:
+                    case DeferredFailed:
+                    case ConcurrentConflict:
+                    case ValidatorFailed:
+                    case RectifierFailed:
+                    case DistributorFailed:
+                    case DatabaseError:
+                        failure = new CommitFailed(txInfo, result);
+                        break;
+                    }
                 } catch (Exception commitFailed) {
                     failure = commitFailed;
                 }

diff --git a/lib_web/src/main/x/web.x b/lib_web/src/main/x/web.x
@@ -379,7 +379,7 @@ module web.xtclang.org {
      * Example:
      *
      *     @OnError
-     *     void handleErrors(RequestIn request, Exception|String) {...}
+     *     ResponseOut handleErrors(RequestIn request, Exception|String) {...}
      */
     mixin OnError
             into Method<WebService, <RequestIn, Exception|String|HttpStatus>, <ResponseOut>>;