diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-03-03 16:53:54 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-03-03 17:04:45 -0800 |
| commit | 8a0ec8866edd552be16c9f7f3a0102ccb63eaf3e (patch) | |
| tree | 49dba592dfe3455ed00620028e8bee0346e965bf /src/core/ext/lb_policy/grpclb | |
| parent | 8c3eaf2f156775a8d4d8f6fafc23c2a985e52676 (diff) | |
| parent | f87d9ea587d52fd34a4cf15e5877d767aa22a963 (diff) | |
Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master
Diffstat (limited to 'src/core/ext/lb_policy/grpclb')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/grpclb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/lb_policy/grpclb/grpclb.c b/src/core/ext/lb_policy/grpclb/grpclb.c index aea0fcc33d..d612591f2e 100644 --- a/src/core/ext/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/lb_policy/grpclb/grpclb.c @@ -861,7 +861,7 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx, arg = grpc_channel_args_find(args->args, GRPC_ARG_SERVER_URI); GPR_ASSERT(arg != NULL); GPR_ASSERT(arg->type == GRPC_ARG_STRING); - grpc_uri *uri = grpc_uri_parse(arg->value.string, true); + grpc_uri *uri = grpc_uri_parse(exec_ctx, arg->value.string, true); GPR_ASSERT(uri->path[0] != '\0'); glb_policy->server_name = gpr_strdup(uri->path[0] == '/' ? uri->path + 1 : uri->path); |