Bugfix xa not throw (#72)

* public xa constructor * Adjust XaGlobalTransaction Excecute function signatures * throw XaGlobalTransaction ExecuteAsync Exception
dtm-labs · Jul 12, 2023 · 37e4945 · 37e4945
1 parent fe25d97
commit 37e4945
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Dtmcli/Xa/Xa.cs b/src/Dtmcli/Xa/Xa.cs
@@ -14,15 +14,15 @@ public sealed class Xa : TransBase
     {
         private readonly IDtmClient _dtmClient;
 
-        internal Xa(IDtmClient dtmHttpClient, string gid)
+        public Xa(IDtmClient dtmHttpClient, string gid)
         {
             this._dtmClient = dtmHttpClient;
             this.Gid = gid;
             this.TransType = DtmCommon.Constant.TYPE_XA;
             this.BranchIDGen = new BranchIDGen();
         }
 
-        internal Xa(IDtmClient dtmHttpClient)
+        public Xa(IDtmClient dtmHttpClient)
         {
             this._dtmClient = dtmHttpClient;
         }

diff --git a/src/Dtmcli/Xa/XaGlobalTransaction.cs b/src/Dtmcli/Xa/XaGlobalTransaction.cs
@@ -20,11 +20,11 @@ public XaGlobalTransaction(IDtmClient dtmClient, ILoggerFactory factory)
         public async Task<string> ExcecuteAsync(Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
         {
             var gid = await _dtmClient.GenGid(cancellationToken);
-            await this.Excecute(gid, xa_cb, cancellationToken);
+            await this.ExcecuteAsync(gid, xa_cb, cancellationToken);
             return gid;
         }
 
-        public async Task Excecute(string gid, Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
+        public async Task ExcecuteAsync(string gid, Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
         {
             await ExcecuteAsync(gid, null, xa_cb, cancellationToken);
         }
@@ -46,6 +46,7 @@ public async Task ExcecuteAsync(string gid, Action<Xa> custom, Func<Xa, Task> xa
                 xa.RollbackReason = ex.Message.Substring(0, ex.Message.Length > 1023 ? 1023 : ex.Message.Length);
                 _logger.LogError(ex, "prepare or submitting global transaction error");
                 await _dtmClient.TransCallDtm(null, xa, Constant.Request.OPERATION_ABORT, cancellationToken);
+                throw;
             }
         }
     }