code improvement at middleware#createHTTPRequest

jeevatkm · jeevatkm · commit 0eed47a8f8c2 · 2016-07-08T09:00:13.000-07:00
diff --git a/middleware.go b/middleware.go
@@ -139,10 +139,13 @@ func createHTTPRequest(c *Client, r *Request) (err error) {
 		r.RawRequest, err = http.NewRequest(r.Method, r.URL, r.bodyBuf)
 	}
 
-	if err == nil {
-		r.RawRequest.Close = c.closeConnection
+	if err != nil {
+		return
 	}
 
+	// Assign close connection option
+	r.RawRequest.Close = c.closeConnection
+
 	// Add headers into http request
 	r.RawRequest.Header = r.Header
 
@@ -151,6 +154,7 @@ func createHTTPRequest(c *Client, r *Request) (err error) {
 		r.RawRequest.AddCookie(cookie)
 	}
 
+	// it's for non-http scheme option
 	if r.RawRequest.URL != nil && r.RawRequest.URL.Scheme == "" {
 		r.RawRequest.URL.Scheme = c.scheme
 		r.RawRequest.URL.Host = r.URL

Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,13 @@ func createHTTPRequest(c Client, r Request) (err error) {`
`139`	`139`	`r.RawRequest, err = http.NewRequest(r.Method, r.URL, r.bodyBuf)`
`140`	`140`	`}`
`141`	`141`
`142`		`- if err == nil {`
`143`		`- r.RawRequest.Close = c.closeConnection`
	`142`	`+ if err != nil {`
	`143`	`+ return`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ // Assign close connection option`
	`147`	`+ r.RawRequest.Close = c.closeConnection`
	`148`	`+`
`146`	`149`	`// Add headers into http request`
`147`	`150`	`r.RawRequest.Header = r.Header`
`148`	`151`
`@@ -151,6 +154,7 @@ func createHTTPRequest(c Client, r Request) (err error) {`
`151`	`154`	`r.RawRequest.AddCookie(cookie)`
`152`	`155`	`}`
`153`	`156`
	`157`	`+ // it's for non-http scheme option`
`154`	`158`	`if r.RawRequest.URL != nil && r.RawRequest.URL.Scheme == "" {`
`155`	`159`	`r.RawRequest.URL.Scheme = c.scheme`
`156`	`160`	`r.RawRequest.URL.Host = r.URL`