This is an automated email from the ASF dual-hosted git repository.

yixia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-seata-go.git


The following commit(s) were added to refs/heads/master by this push:
     new b2544664 active xa connection rollback fix (#672)
b2544664 is described below

commit b254466445545eded5db5b76313eb0b35c9aaaa1
Author: smiletrl <[email protected]>
AuthorDate: Sat Mar 16 18:33:21 2024 +0800

    active xa connection rollback fix (#672)
---
 pkg/datasource/sql/conn_xa.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/datasource/sql/conn_xa.go b/pkg/datasource/sql/conn_xa.go
index f557c1e2..c4767bcb 100644
--- a/pkg/datasource/sql/conn_xa.go
+++ b/pkg/datasource/sql/conn_xa.go
@@ -257,11 +257,11 @@ func (c *XAConn) start(ctx context.Context) error {
 }
 
 func (c *XAConn) end(ctx context.Context, flags int) error {
-       err := c.termination(c.xaBranchXid.String())
+       err := c.xaResource.End(ctx, c.xaBranchXid.String(), flags)
        if err != nil {
                return err
        }
-       err = c.xaResource.End(ctx, c.xaBranchXid.String(), flags)
+       err = c.termination(c.xaBranchXid.String())
        if err != nil {
                return err
        }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to