Wait jsonrpc main write loop to finish

eclipse-che · Jun 20, 2017 · 7a0c1de · 7a0c1de
1 parent 823461c
commit 7a0c1de
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/agents/go-agents/core/jsonrpc/tunnel.go b/agents/go-agents/core/jsonrpc/tunnel.go
@@ -96,7 +96,7 @@ func NewTunnel(conn NativeConn, dispatcher ReqDispatcher) *Tunnel {
 		reqDispatcher: dispatcher,
 		q:             q,
 	}
-	tunnel.closer = &closer{tunnel: tunnel}
+	tunnel.closer = &closer{tunnel: tunnel, outClosed: make(chan bool, 1)}
 	return tunnel
 }
 
@@ -281,6 +281,7 @@ func (tun *Tunnel) mainWriteLoop() {
 			}
 		}
 	}
+	tun.closer.outClosed <- true
 }
 
 func (tun *Tunnel) mainReadLoop() {
@@ -413,16 +414,21 @@ type draft struct {
 }
 
 type closer struct {
-	once   sync.Once
-	tunnel *Tunnel
+	once      sync.Once
+	tunnel    *Tunnel
+	outClosed chan bool
 	// 0 - not closed, 1 - closed
 	closed int32
 }
 
 func (closer *closer) closeOnce() {
 	closer.once.Do(func() {
 		atomic.StoreInt32(&closer.closed, 1)
+
 		close(closer.tunnel.jsonOut)
+		// wait write loop to complete
+		<- closer.outClosed
+
 		closer.tunnel.q.stopWatching()
 		if err := closer.tunnel.conn.Close(); err != nil {
 			log.Printf("Error while closing connection, %s", err.Error())