Merge pull request #1316 from halseth/connmgr-nil-addr

connmanager: check Addr for nil
This commit is contained in:
Olaoluwa Osuntokun 2018-10-12 17:43:14 -07:00 committed by GitHub
commit 5f1bfdec9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -89,7 +89,7 @@ func (c *ConnReq) State() ConnState {
// String returns a human-readable string for the connection request. // String returns a human-readable string for the connection request.
func (c *ConnReq) String() string { func (c *ConnReq) String() string {
if c.Addr.String() == "" { if c.Addr == nil || c.Addr.String() == "" {
return fmt.Sprintf("reqid %d", atomic.LoadUint64(&c.id)) return fmt.Sprintf("reqid %d", atomic.LoadUint64(&c.id))
} }
return fmt.Sprintf("%s (reqid %d)", c.Addr, atomic.LoadUint64(&c.id)) return fmt.Sprintf("%s (reqid %d)", c.Addr, atomic.LoadUint64(&c.id))