octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #401 from github/sock-nil-connection

Browse Source 
error and nil checks on socket connection
This commit is contained in:
Shlomi Noach 2017-04-18 06:42:48 +03:00 committed by GitHub
commit de349a79c6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
go/logic/server.go
View File

@ -98,8 +98,13 @@ func (this *Server) Serve() (err error) {
} }
func (this *Server) handleConnection(conn net.Conn) (err error) { func (this *Server) handleConnection(conn net.Conn) (err error) {
defer conn.Close() if conn != nil {
defer conn.Close()
}
command, _, err := bufio.NewReader(conn).ReadLine() command, _, err := bufio.NewReader(conn).ReadLine()
if err != nil {
return err
}
return this.onServerCommand(string(command), bufio.NewWriter(conn)) return this.onServerCommand(string(command), bufio.NewWriter(conn))
} }