From abdd3076527cdce48e5d52c77e8090cde467a91f Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Sat, 17 Sep 2022 16:01:17 +0800 Subject: [PATCH] Make the nil and empty of the `BinPayload` equivalent --- dtmsvr/trans_status.go | 2 +- dtmutil/utils.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dtmsvr/trans_status.go b/dtmsvr/trans_status.go index 23334d7..5fa142c 100644 --- a/dtmsvr/trans_status.go +++ b/dtmsvr/trans_status.go @@ -141,7 +141,7 @@ func (t *TransGlobal) getHTTPResult(uri string, branchID, op string, branchPaylo SetHeader("Content-type", "application/json"). SetHeaders(t.Ext.Headers). SetHeaders(t.TransOptions.BranchHeaders). - Execute(dtmimp.If(branchPayload != nil || t.TransType == "xa", "POST", "GET").(string), uri) + Execute(dtmimp.If(!dtmutil.IsEmptyBinPayload(branchPayload) || t.TransType == "xa", "POST", "GET").(string), uri) if err != nil { return err } diff --git a/dtmutil/utils.go b/dtmutil/utils.go index eec4265..74162a1 100644 --- a/dtmutil/utils.go +++ b/dtmutil/utils.go @@ -173,3 +173,8 @@ func RunSQLScript(conf dtmcli.DBConf, script string, skipDrop bool) { logger.Infof("sql scripts finished: %s", s) } } + +// IsEmptyBinPayload returns true if the bin data is nil or empty +func IsEmptyBinPayload(binPayload []byte) bool { + return binPayload == nil || len(binPayload) == 0 +}