From e4c8a2841c4fb7dfa9492846de6c9fb34b93800d Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Sat, 22 Sep 2012 05:54:42 +1000 Subject: [PATCH] [release-branch.go1] net/http: fix misplaced defer and example MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« backport 989f373141cc net/http: fix misplaced defer and example Moves the defer (again). Also, correct the example documentation to match. R=r, robert.hencke, iant, dsymonds, bradfitz CC=golang-dev https://golang.org/cl/6458158 »»» --- src/pkg/net/http/example_test.go | 2 +- src/pkg/net/http/transport_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg/net/http/example_test.go b/src/pkg/net/http/example_test.go index ec814407dd..22073eaf7a 100644 --- a/src/pkg/net/http/example_test.go +++ b/src/pkg/net/http/example_test.go @@ -43,10 +43,10 @@ func ExampleGet() { log.Fatal(err) } robots, err := ioutil.ReadAll(res.Body) + res.Body.Close() if err != nil { log.Fatal(err) } - res.Body.Close() fmt.Printf("%s", robots) } diff --git a/src/pkg/net/http/transport_test.go b/src/pkg/net/http/transport_test.go index bd963ffec5..e676bf6db3 100644 --- a/src/pkg/net/http/transport_test.go +++ b/src/pkg/net/http/transport_test.go @@ -160,11 +160,11 @@ func TestTransportConnectionCloseOnResponse(t *testing.T) { if err != nil { t.Fatalf("error in connectionClose=%v, req #%d, Do: %v", connectionClose, n, err) } + defer res.Body.Close() body, err := ioutil.ReadAll(res.Body) if err != nil { t.Fatalf("error in connectionClose=%v, req #%d, ReadAll: %v", connectionClose, n, err) } - defer res.Body.Close() return string(body) } -- 2.50.0