response: pass close error in decode
This commit was moved from ipfs/go-ipfs-http-client@4a87232ecaa96246f038d15eb7ee6094216a201e
Łukasz Magiera committed
Feb 20, 2019 at 22:08 UTC
19d91fbb259220e91c8887ee8a09218865418720
1 file changed
+7
-2
client/httpapi/response.go
+7
-2
@@ -61,12 +61,17 @@ func (r *Response) Cancel() error {
61
62
// Decode reads request body and decodes it as json
63
func (r *Response) decode(dec interface{}) error {
64
- defer r.Close()
64
if r.Error != nil {
65
return r.Error
66
}
67
69
- return json.NewDecoder(r.Output).Decode(dec)
68
+ err := json.NewDecoder(r.Output).Decode(dec)
69
+ err2 := r.Close()
70
+ if err != nil {
71
+ return err
72
+ }
73
+
74
+ return err2
75
}
76
77
type Error struct {