From ef4085184df3842ed914e67b3fce29b2e804c4b2 Mon Sep 17 00:00:00 2001 From: Luky116Liuyuecai Date: Tue, 13 Dec 2022 09:05:53 +0800 Subject: [PATCH 1/2] fix branch register response --- pkg/rm/rm_remoting.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/rm/rm_remoting.go b/pkg/rm/rm_remoting.go index b840e969e..22144503c 100644 --- a/pkg/rm/rm_remoting.go +++ b/pkg/rm/rm_remoting.go @@ -18,6 +18,7 @@ package rm import ( + "fmt" "sync" "github.com/pkg/errors" @@ -59,6 +60,9 @@ func (r *RMRemoting) BranchRegister(param BranchRegisterParam) (int64, error) { log.Errorf("BranchRegister error: %v, res %v", err.Error(), resp) return 0, err } + if resp.(message.BranchRegisterResponse).ResultCode == message.ResultCodeFailed { + return 0, fmt.Errorf("Response %s", err.Error()) + } return resp.(message.BranchRegisterResponse).BranchId, nil } From 94f0c7e982439ac2e865061a1f17f3102c5e393e Mon Sep 17 00:00:00 2001 From: Luky116Liuyuecai Date: Tue, 13 Dec 2022 09:08:21 +0800 Subject: [PATCH 2/2] fix branch register response --- pkg/rm/rm_remoting.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/rm/rm_remoting.go b/pkg/rm/rm_remoting.go index 22144503c..54c3d8073 100644 --- a/pkg/rm/rm_remoting.go +++ b/pkg/rm/rm_remoting.go @@ -60,10 +60,11 @@ func (r *RMRemoting) BranchRegister(param BranchRegisterParam) (int64, error) { log.Errorf("BranchRegister error: %v, res %v", err.Error(), resp) return 0, err } - if resp.(message.BranchRegisterResponse).ResultCode == message.ResultCodeFailed { - return 0, fmt.Errorf("Response %s", err.Error()) + branchResp := resp.(message.BranchRegisterResponse) + if branchResp.ResultCode == message.ResultCodeFailed { + return 0, fmt.Errorf("Response %s", branchResp.Msg) } - return resp.(message.BranchRegisterResponse).BranchId, nil + return branchResp.BranchId, nil } // BranchReport Report status of transaction branch