Always return non-nil error in OpenAppend if handshake fails

sqs · sqs · commit f4e2350a3a20 · 2013-09-24T11:23:16.000-07:00
diff --git a/client.go b/client.go
@@ -79,7 +79,11 @@ func OpenAppend(u *url.URL) (io.WriteCloser, error) {
 	ws, resp, err := newClient(u, "APPEND")
 	if err != nil {
 		if err == websocket.ErrBadHandshake {
-			return nil, errorFromResponse(resp, nil)
+			err2 := errorFromResponse(resp, nil)
+			if err2 != nil {
+				return nil, err2
+			}
+			return nil, err
 		}
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,11 @@ func OpenAppend(u *url.URL) (io.WriteCloser, error) {`
`79`	`79`	`ws, resp, err := newClient(u, "APPEND")`
`80`	`80`	`if err != nil {`
`81`	`81`	`if err == websocket.ErrBadHandshake {`
`82`		`- return nil, errorFromResponse(resp, nil)`
	`82`	`+ err2 := errorFromResponse(resp, nil)`
	`83`	`+ if err2 != nil {`
	`84`	`+ return nil, err2`
	`85`	`+ }`
	`86`	`+ return nil, err`
`83`	`87`	`}`
`84`	`88`	`return nil, err`
`85`	`89`	`}`