Skip to content

Commit 37e4945

Browse files
authored
Bugfix xa not throw (#72)
* public xa constructor * Adjust XaGlobalTransaction Excecute function signatures * throw XaGlobalTransaction ExecuteAsync Exception
1 parent fe25d97 commit 37e4945

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/Dtmcli/Xa/Xa.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public sealed class Xa : TransBase
1414
{
1515
private readonly IDtmClient _dtmClient;
1616

17-
internal Xa(IDtmClient dtmHttpClient, string gid)
17+
public Xa(IDtmClient dtmHttpClient, string gid)
1818
{
1919
this._dtmClient = dtmHttpClient;
2020
this.Gid = gid;
2121
this.TransType = DtmCommon.Constant.TYPE_XA;
2222
this.BranchIDGen = new BranchIDGen();
2323
}
2424

25-
internal Xa(IDtmClient dtmHttpClient)
25+
public Xa(IDtmClient dtmHttpClient)
2626
{
2727
this._dtmClient = dtmHttpClient;
2828
}

src/Dtmcli/Xa/XaGlobalTransaction.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ public XaGlobalTransaction(IDtmClient dtmClient, ILoggerFactory factory)
2020
public async Task<string> ExcecuteAsync(Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
2121
{
2222
var gid = await _dtmClient.GenGid(cancellationToken);
23-
await this.Excecute(gid, xa_cb, cancellationToken);
23+
await this.ExcecuteAsync(gid, xa_cb, cancellationToken);
2424
return gid;
2525
}
2626

27-
public async Task Excecute(string gid, Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
27+
public async Task ExcecuteAsync(string gid, Func<Xa, Task> xa_cb, CancellationToken cancellationToken = default)
2828
{
2929
await ExcecuteAsync(gid, null, xa_cb, cancellationToken);
3030
}
@@ -46,6 +46,7 @@ public async Task ExcecuteAsync(string gid, Action<Xa> custom, Func<Xa, Task> xa
4646
xa.RollbackReason = ex.Message.Substring(0, ex.Message.Length > 1023 ? 1023 : ex.Message.Length);
4747
_logger.LogError(ex, "prepare or submitting global transaction error");
4848
await _dtmClient.TransCallDtm(null, xa, Constant.Request.OPERATION_ABORT, cancellationToken);
49+
throw;
4950
}
5051
}
5152
}

0 commit comments

Comments
 (0)