Merge branch 'master' into drop-add-same-column

This commit is contained in:
Shlomi Noach 2017-04-23 20:26:31 +03:00 committed by GitHub
commit e2a6b857d0

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) {
if conn != nil {
defer conn.Close() 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))
} }