community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use defer Unlock() in ListAndServe" 

This reverts commit d2cb5e8fef.
This commit is contained in:
Miek Gieben 2015-08-17 11:11:14 +01:00
parent 0fe10e90c4
commit eac4ea318f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server.go
View File

@ -286,7 +286,6 @@ func (srv *Server) ListenAndServe() error {
srv.lock.Unlock()
return &Error{err: "server already started"}
}
defer srv.lock.Unlock()
srv.stopUDP, srv.stopTCP = make(chan bool), make(chan bool)
srv.started = true
addr := srv.Addr
@ -307,6 +306,7 @@ func (srv *Server) ListenAndServe() error {
return e
}
srv.Listener = l
srv.lock.Unlock()
return srv.serveTCP(l)
case "udp", "udp4", "udp6":
a, e := net.ResolveUDPAddr(srv.Net, addr)
@ -321,8 +321,10 @@ func (srv *Server) ListenAndServe() error {
return e
}
srv.PacketConn = l
srv.lock.Unlock()
return srv.serveUDP(l)
}
srv.lock.Unlock()
return &Error{err: "bad network"}
}