[release-branch.go1] net/http: fix misplaced defer and example

««« 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

»»»

diff --git a/src/pkg/net/http/example_test.go b/src/pkg/net/http/example_test.go
index ec814407ddb2bddc97cb349b57b003ed60f0cec5..22073eaf7aa88fba065e64f96d4bfcfdd17adcec 100644 (file)
--- 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 bd963ffec52faea48b3a39f176bee23d862f56fc..e676bf6db397eea8122fd1f118e6f8ec9554a2f6 100644 (file)
--- 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)
                }