Merge pull request #14880 from Microsoft/10662-paniconremotetest

Stop SIGSEGV on test dial not reachable
This commit is contained in:
Phil Estes 2015-07-22 23:21:12 -04:00
commit d593130fda
1 changed files with 2 additions and 4 deletions

View File

@ -338,11 +338,9 @@ func sockRequest(method, endpoint string, data interface{}) (int, []byte, error)
res, body, err := sockRequestRaw(method, endpoint, jsonData, "application/json") res, body, err := sockRequestRaw(method, endpoint, jsonData, "application/json")
if err != nil { if err != nil {
b, _ := ioutil.ReadAll(body) return -1, nil, err
return -1, b, err
} }
var b []byte b, err := readBody(body)
b, err = readBody(body)
return res.StatusCode, b, err return res.StatusCode, b, err
} }