From: Dmitriy Vyukov Date: Fri, 20 Jun 2014 05:04:37 +0000 (-0700) Subject: net: simplify code X-Git-Tag: go1.4beta1~1252 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5ce98da1a27f55a11107c861633b68760d9d03e6;p=gostls13.git net: simplify code Single-case select with a non-nil channel is pointless. LGTM=mikioh.mikioh R=mikioh.mikioh CC=golang-codereviews https://golang.org/cl/103920044 --- diff --git a/src/pkg/net/dial.go b/src/pkg/net/dial.go index 93569c253c..ac5c59fe79 100644 --- a/src/pkg/net/dial.go +++ b/src/pkg/net/dial.go @@ -214,14 +214,12 @@ func dialMulti(net, addr string, la Addr, ras addrList, deadline time.Time) (Con nracers := len(ras) for nracers > 0 { sig <- true - select { - case racer := <-lane: - if racer.error == nil { - return racer.Conn, nil - } - lastErr = racer.error - nracers-- + racer := <-lane + if racer.error == nil { + return racer.Conn, nil } + lastErr = racer.error + nracers-- } return nil, lastErr }