aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-29 18:47:35 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-07-29 18:47:35 -0700
commit6b9f5c648803bcfd242c16600423cfc983966353 (patch)
tree3589da6d2b957bb1180c0529383414394cfcc214 /src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
parent83f4d4e2187892294a46bc31c1e8d27def2ee481 (diff)
Provide default host name
Diffstat (limited to 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.c')
-rw-r--r--src/core/client_config/subchannel_factory_decorators/merge_channel_args.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
index 17e89d6d4d..7e028857ac 100644
--- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
+++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
@@ -62,6 +62,7 @@ static grpc_subchannel *merge_args_factory_create_subchannel(
grpc_channel_args *final_args =
grpc_channel_args_merge(args->args, f->merge_args);
grpc_subchannel *s;
+ args->args = final_args;
s = grpc_subchannel_factory_create_subchannel(f->wrapped, args);
grpc_channel_args_destroy(final_args);
return s;
@@ -76,6 +77,7 @@ grpc_subchannel_factory *grpc_subchannel_factory_merge_channel_args(
merge_args_factory *f = gpr_malloc(sizeof(*f));
f->base.vtable = &merge_args_factory_vtable;
gpr_ref_init(&f->refs, 1);
+ grpc_subchannel_factory_ref(input);
f->wrapped = input;
f->merge_args = grpc_channel_args_copy(args);
return &f->base;