From: Dave Cheney <dave@cheney.net>
Date: Fri, 21 Sep 2012 19:54:42 +0000 (+1000)
Subject: [release-branch.go1] net/http: fix misplaced defer and example
X-Git-Tag: go1.0.3~81
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e4c8a2841c4fb7dfa9492846de6c9fb34b93800d;p=gostls13.git

[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 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)
 		}