diff options
| author |  Mark D. Roth <roth@google.com> | 2017-03-17 10:46:31 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-17 10:46:31 -0700 |
| commit | a340987ec4190d8e73d054c0dc44136ea5cb5e4c (patch) | |
| tree | 596ebf9787530257c4a71aad7f16bb8f3c8c2059 /src | |
| parent | 18f5b66b94ec8be3d7ccda0846bb6fcd4372439f (diff) | |
| parent | 364fa33576bc09407b37b3ecca43f7b26d4f7c21 (diff) | |
Merge pull request #10179 from markdroth/proxy_mapper_channel_arg_fix
Also override subchannel address in channel args when proxy mapper is used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/client_channel/subchannel.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/core/ext/client_channel/subchannel.c b/src/core/ext/client_channel/subchannel.c index cef08a04ea..ed5029ea9a 100644 --- a/src/core/ext/client_channel/subchannel.c +++ b/src/core/ext/client_channel/subchannel.c @@ -341,17 +341,15 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx, GPR_ASSERT(new_address != NULL); gpr_free(addr); addr = new_address; - if (new_args != NULL) c->args = new_args; - } - if (c->args == NULL) { - static const char *keys_to_remove[] = {GRPC_ARG_SUBCHANNEL_ADDRESS}; - grpc_arg new_arg = grpc_create_subchannel_address_arg(addr); - c->args = grpc_channel_args_copy_and_add_and_remove( - args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &new_arg, - 1); - gpr_free(new_arg.value.string); } + static const char *keys_to_remove[] = {GRPC_ARG_SUBCHANNEL_ADDRESS}; + grpc_arg new_arg = grpc_create_subchannel_address_arg(addr); gpr_free(addr); + c->args = grpc_channel_args_copy_and_add_and_remove( + new_args != NULL ? new_args : args->args, keys_to_remove, + GPR_ARRAY_SIZE(keys_to_remove), &new_arg, 1); + gpr_free(new_arg.value.string); + if (new_args != NULL) grpc_channel_args_destroy(exec_ctx, new_args); c->root_external_state_watcher.next = c->root_external_state_watcher.prev = &c->root_external_state_watcher; grpc_closure_init(&c->connected, subchannel_connected, c, |