Browse Source

Make the nil and empty of the `BinPayload` equivalent

pull/348/head
gdlcf88 4 years ago
parent
commit
abdd307652
  1. 2
      dtmsvr/trans_status.go
  2. 5
      dtmutil/utils.go

2
dtmsvr/trans_status.go

@ -141,7 +141,7 @@ func (t *TransGlobal) getHTTPResult(uri string, branchID, op string, branchPaylo
SetHeader("Content-type", "application/json"). SetHeader("Content-type", "application/json").
SetHeaders(t.Ext.Headers). SetHeaders(t.Ext.Headers).
SetHeaders(t.TransOptions.BranchHeaders). 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 { if err != nil {
return err return err
} }

5
dtmutil/utils.go

@ -173,3 +173,8 @@ func RunSQLScript(conf dtmcli.DBConf, script string, skipDrop bool) {
logger.Infof("sql scripts finished: %s", s) 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
}

Loading…
Cancel
Save