From ae0194891fb8ff9a9dda4e6705f7b020236b357d Mon Sep 17 00:00:00 2001
From: fwang2002 <fwang2002@users.noreply.github.com>
Date: Tue, 14 Jan 2014 12:04:29 +0800
Subject: [PATCH] let Serve exit when server is stopped

---
 lib/go/thrift/simple_server.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/go/thrift/simple_server.go b/lib/go/thrift/simple_server.go
index b5cb0e1297d..b14437abbe2 100644
--- a/lib/go/thrift/simple_server.go
+++ b/lib/go/thrift/simple_server.go
@@ -119,7 +119,7 @@ func (p *TSimpleServer) Serve() error {
 	}
 	for !p.stopped {
 		client, err := p.serverTransport.Accept()
-		if err != nil {
+		if err != nil && !p.stopped {
 			log.Println("Accept err: ", err)
 		}
 		if client != nil {
@@ -136,6 +136,7 @@ func (p *TSimpleServer) Serve() error {
 func (p *TSimpleServer) Stop() error {
 	p.stopped = true
 	p.serverTransport.Interrupt()
+	p.serverTransport.Close()
 	return nil
 }