opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #564 from iamqizhao/master

Browse Source 
Fix a race between transport creation and wait returning
This commit is contained in:
Qi Zhao
2016-02-22 17:50:41 -08:00
parent 74d8091165 0be94ab3f5
commit 19b24c3042
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clientconn.go
View File

@ -539,8 +539,9 @@ func (cc *Conn) Wait(ctx context.Context) (transport.ClientTransport, error) {
cc.mu.Unlock() cc.mu.Unlock()
return nil, ErrClientConnClosing return nil, ErrClientConnClosing
case cc.state == Ready: case cc.state == Ready:
ct := cc.transport
cc.mu.Unlock() cc.mu.Unlock()
return cc.transport, nil return ct, nil
default: default:
ready := cc.ready ready := cc.ready
if ready == nil { if ready == nil {