Merge pull request #183 from pantianying/fix_deadlock

Fix: gettyRPCClientPool.remove deadlock
apache · Aug 31, 2019 · a8cb98e · a8cb98e
2 parents b38db96 + ad15595
commit a8cb98e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/protocol/dubbo/pool.go b/protocol/dubbo/pool.go
@@ -275,6 +275,7 @@ func (p *gettyRPCClientPool) close() {
 func (p *gettyRPCClientPool) getGettyRpcClient(protocol, addr string) (*gettyRPCClient, error) {
 
 	p.Lock()
+	defer p.Unlock()
 	if p.conns == nil {
 		return nil, errClientPoolClosed
 	}
@@ -290,12 +291,9 @@ func (p *gettyRPCClientPool) getGettyRpcClient(protocol, addr string) (*gettyRPC
 			continue
 		}
 		conn.created = now //update created time
-
-		p.Unlock()
 		return conn, nil
 	}
 	// create new conn
-	p.Unlock()
 	return newGettyRPCClientConn(p, protocol, addr)
 }