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

Merge pull request #141 from iamqizhao/creds

Browse Source 
Fix an ordering issue of creds
This commit is contained in:
Qi Zhao
2015-03-30 18:27:20 -07:00
parent 8ce50750fe 945fb3f301
commit 18fa27e440
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
transport/http2_client.go
View File

@ -198,17 +198,15 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
return nil, ContextErr(context.DeadlineExceeded) return nil, ContextErr(context.DeadlineExceeded)
} }
} }
var authData map[string]string authData := make(map[string]string)
for _, c := range t.authCreds { for _, c := range t.authCreds {
authData, err = c.GetRequestMetadata(ctx) data, err := c.GetRequestMetadata(ctx)
select {
case <-ctx.Done():
return nil, ContextErr(ctx.Err())
default:
}
if err != nil { if err != nil {
return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err) return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
} }
for k, v := range data {
authData[k] = v
}
} }
if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil { if _, err := wait(ctx, t.shutdownChan, t.writableChan); err != nil {
return nil, err return nil, err