diff options
| author |  Mark D. Roth <roth@google.com> | 2017-03-16 08:00:36 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-03-16 08:00:36 -0700 |
| commit | 364fa33576bc09407b37b3ecca43f7b26d4f7c21 (patch) | |
| tree | 42d00f30f145494430fb5d9dcbcfda11a7079c19 /src/core | |
| parent | 3cafec2f55f66e3df61569579c8259b2e5b5ee00 (diff) | |
Override subchannel address in channel args when proxy mapper is used.
Diffstat (limited to 'src/core')
| -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 5df0a9060d..2528941981 100644 --- a/src/core/ext/client_channel/subchannel.c +++ b/src/core/ext/client_channel/subchannel.c @@ -340,17 +340,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, |