From a44ab00e07e5f05913b5c1a8386c442e7c13f348 Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Fri, 7 Jan 2022 18:14:43 +0800
Subject: [PATCH] use err==nil in tcc callbranch

---
 dtmgrpc/tcc.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dtmgrpc/tcc.go b/dtmgrpc/tcc.go
index 0fd5b7d..bd1b336 100644
--- a/dtmgrpc/tcc.go
+++ b/dtmgrpc/tcc.go
@@ -75,16 +75,15 @@ func TccFromGrpc(ctx context.Context) (*TccGrpc, error) {
 func (t *TccGrpc) CallBranch(busiMsg proto.Message, tryURL string, confirmURL string, cancelURL string, reply interface{}) error {
 	branchID := t.NewSubBranchID()
 	bd, err := proto.Marshal(busiMsg)
-	if err != nil {
-		return err
+	if err == nil {
+		_, err = dtmgimp.MustGetDtmClient(t.Dtm).RegisterBranch(context.Background(), &dtmgpb.DtmBranchRequest{
+			Gid:         t.Gid,
+			TransType:   t.TransType,
+			BranchID:    branchID,
+			BusiPayload: bd,
+			Data:        map[string]string{"confirm": confirmURL, "cancel": cancelURL},
+		})
 	}
-	_, err = dtmgimp.MustGetDtmClient(t.Dtm).RegisterBranch(context.Background(), &dtmgpb.DtmBranchRequest{
-		Gid:         t.Gid,
-		TransType:   t.TransType,
-		BranchID:    branchID,
-		BusiPayload: bd,
-		Data:        map[string]string{"confirm": confirmURL, "cancel": cancelURL},
-	})
 	if err != nil {
 		return err
 	}