Merge pull request #2034 from estesp/cherrypick-npe-fix

stevvooe · web-flow · commit 383a6dea31ce · 2018-01-19T16:42:30.000-08:00
[release/1.0] cherrypick Fix NPE in dialer
diff --git a/dialer/dialer.go b/dialer/dialer.go
@@ -42,7 +42,7 @@ func Dialer(address string, timeout time.Duration) (net.Conn, error) {
 		close(stopC)
 		go func() {
 			dr := <-synC
-			if dr != nil {
+			if dr != nil && dr.c != nil {
 				dr.c.Close()
 			}
 		}()

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func Dialer(address string, timeout time.Duration) (net.Conn, error) {`
`42`	`42`	`close(stopC)`
`43`	`43`	`go func() {`
`44`	`44`	`dr := <-synC`
`45`		`- if dr != nil {`
	`45`	`+ if dr != nil && dr.c != nil {`
`46`	`46`	`dr.c.Close()`
`47`	`47`	`}`
`48`	`48`	`}()`