Skip to content

Commit a92527c

Browse files
committed
dialers/retrier: assign at least one err when conn is nil
1 parent 6397542 commit a92527c

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

intra/dialers/retrier.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,10 @@ func (r *retrier) Read(buf []byte) (n int, err error) {
429429
n, retryerr = r.retryWriteReadLocked(buf)
430430
c = r.conn // re-assign c to newConn, if any; may be nil
431431
if c == nil || core.IsNil(c) {
432-
err = core.UniqErr(err, retryerr)
432+
retryerr = core.OneErr(retryerr, errNoConn)
433+
err = core.JoinErr(err, retryerr)
433434
} else {
434-
err = nil
435+
err = nil // break
435436
}
436437
logeor(retryerr, log.I)("retrier: read#%d + (mult? %t / c: %d): [%s<=%s] %d; err? %v",
437438
r.retryCount, r.multidial, r.nextDialerIdx, laddr(c), r.raddr, n, retryerr)

0 commit comments

Comments
 (0)