Merge pull request #564 from iamqizhao/master

Fix a race between transport creation and wait returning
2016-02-22 17:50:41 -08:00
parent 74d8091165 0be94ab3f5
commit 19b24c3042
1 changed files with 2 additions and 1 deletions
--- a/clientconn.go
+++ b/clientconn.go
@ -539,8 +539,9 @@ func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
 			cc.mu.Unlock()
 			return nil, ErrClientConnClosing
 		case cc.state == Ready:
+			ct := cc.transport
 			cc.mu.Unlock()
-			return cc.transport, nil
+			return ct, nil
 		default:
 			ready := cc.ready
 			if ready == nil {