darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #633 from takama/master

Browse source 
second excluding of unused transformation
This commit is contained in:
Brad Rydzewski 2014-10-26 11:54:25 -07:00
commit e95644fd98
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shared/build/docker/client.go
View file

@ -214,12 +214,8 @@ func (c *Client) do(method, path string, in, out interface{}) error {
return err
}
// Read the bytes from the body (make sure we defer close the body)
// make sure we defer close the body
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
// Check for an http error status (ie not 200 StatusOK)
switch resp.StatusCode {
@ -233,9 +229,9 @@ func (c *Client) do(method, path string, in, out interface{}) error {
return ErrBadRequest
}
// Unmarshall the JSON response
// Decode the JSON response
if out != nil {
return json.Unmarshal(body, out)
return json.NewDecoder(resp.Body).Decode(out)
}
return nil