Skip to content

Commit b0d14de

Browse files
committed
check map is nil
1 parent 33807f2 commit b0d14de

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

client/client.go

+10-5
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,18 @@ func (client *Client) SendRaw(ctx context.Context, r *protocol.Message) (map[str
275275
call.ServiceMethod = r.ServiceMethod
276276
meta := ctx.Value(share.ReqMetaDataKey)
277277

278-
rmeta := r.Metadata
279-
if rmeta == nil {
280-
rmeta = make(map[string]string)
278+
rmeta := make(map[string]string)
279+
if meta != nil {
280+
for k, v := range meta.(map[string]string) {
281+
rmeta[k] = v
282+
}
281283
}
282-
for k, v := range meta.(map[string]string) {
283-
rmeta[k] = v
284+
if r.Metadata != nil {
285+
for k, v := range r.Metadata {
286+
rmeta[k] = v
287+
}
284288
}
289+
285290
if meta != nil { //copy meta in context to meta in requests
286291
call.Metadata = rmeta
287292
}

0 commit comments

Comments
 (0)