Revert "Use defer Unlock() in ListAndServe"
This reverts commit d2cb5e8fef
.
This commit is contained in:
parent
0fe10e90c4
commit
eac4ea318f
|
@ -286,7 +286,6 @@ func (srv *Server) ListenAndServe() error {
|
||||||
srv.lock.Unlock()
|
srv.lock.Unlock()
|
||||||
return &Error{err: "server already started"}
|
return &Error{err: "server already started"}
|
||||||
}
|
}
|
||||||
defer srv.lock.Unlock()
|
|
||||||
srv.stopUDP, srv.stopTCP = make(chan bool), make(chan bool)
|
srv.stopUDP, srv.stopTCP = make(chan bool), make(chan bool)
|
||||||
srv.started = true
|
srv.started = true
|
||||||
addr := srv.Addr
|
addr := srv.Addr
|
||||||
|
@ -307,6 +306,7 @@ func (srv *Server) ListenAndServe() error {
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
srv.Listener = l
|
srv.Listener = l
|
||||||
|
srv.lock.Unlock()
|
||||||
return srv.serveTCP(l)
|
return srv.serveTCP(l)
|
||||||
case "udp", "udp4", "udp6":
|
case "udp", "udp4", "udp6":
|
||||||
a, e := net.ResolveUDPAddr(srv.Net, addr)
|
a, e := net.ResolveUDPAddr(srv.Net, addr)
|
||||||
|
@ -321,8 +321,10 @@ func (srv *Server) ListenAndServe() error {
|
||||||
return e
|
return e
|
||||||
}
|
}
|
||||||
srv.PacketConn = l
|
srv.PacketConn = l
|
||||||
|
srv.lock.Unlock()
|
||||||
return srv.serveUDP(l)
|
return srv.serveUDP(l)
|
||||||
}
|
}
|
||||||
|
srv.lock.Unlock()
|
||||||
return &Error{err: "bad network"}
|
return &Error{err: "bad network"}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue