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

Shlomi Noach · web-flow · commit e2a6b857d031 · 2017-04-23T20:26:31.000+03:00
diff --git a/go/logic/server.go b/go/logic/server.go
@@ -98,8 +98,13 @@ func (this *Server) Serve() (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()
+	if err != nil {
+		return err
+	}
 	return this.onServerCommand(string(command), bufio.NewWriter(conn))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,13 @@ func (this *Server) Serve() (err error) {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`func (this *Server) handleConnection(conn net.Conn) (err error) {`
`101`		`- defer conn.Close()`
	`101`	`+ if conn != nil {`
	`102`	`+ defer conn.Close()`
	`103`	`+ }`
`102`	`104`	`command, _, err := bufio.NewReader(conn).ReadLine()`
	`105`	`+ if err != nil {`
	`106`	`+ return err`
	`107`	`+ }`
`103`	`108`	`return this.onServerCommand(string(command), bufio.NewWriter(conn))`
`104`	`109`	`}`
`105`	`110`