Skip to content

Commit bb1a4c9

Browse files
committed
dialers/retrier: deep nil check for doDialLocked's conn
1 parent ea15d59 commit bb1a4c9

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

intra/dialers/retrier.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,12 @@ func (r *retrier) dialLocked() error {
312312
c, err := r.doDialLocked(strat)
313313
rtt := time.Since(begin)
314314

315-
r.conn = c // c may be nil
315+
if c != nil && core.IsNotNil(c) { // c may be deep nil
316+
r.conn = c
317+
} else {
318+
r.conn = nil
319+
}
320+
316321
r.timeout = calcTimeout(rtt)
317322

318323
logeif(err)("retrier: dial(%s) %s=>%s; strat: %d (mult? %d %T), rtt: %dms; err? %v",

0 commit comments

Comments
 (0)