diff options
author | Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-12-10 20:33:16 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2015-12-10 20:33:16 -0800 |
commit | c54f88ee8d39e2681d2a014bf245ee6b66d4a21c (patch) | |
tree | b70eb529aac79f2b8b68ffd128bf66105d97aaa0 /src | |
parent | 9b315a14d3639a737612d1eda392ef10234de387 (diff) | |
parent | d47a44d8ad170d78aa675c3aa7d3b2af19f63e3b (diff) |
Merge pull request #4403 from yang-g/fixit_secure_channel_create_c
add a test for secure_channel_create and fix cleanup code
Diffstat (limited to 'src')
-rw-r--r-- | src/core/surface/secure_channel_create.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 863c905ea3..92bd53411d 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -304,22 +304,22 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds, f->master = channel; GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); resolver = grpc_resolver_create(target, &f->base); - if (!resolver) { - grpc_exec_ctx_finish(&exec_ctx); - return NULL; + if (resolver) { + grpc_client_channel_set_resolver( + &exec_ctx, grpc_channel_get_channel_stack(channel), resolver); + GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); } - - grpc_client_channel_set_resolver( - &exec_ctx, grpc_channel_get_channel_stack(channel), resolver); - GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); grpc_subchannel_factory_unref(&exec_ctx, &f->base); GRPC_SECURITY_CONNECTOR_UNREF(&security_connector->base, "channel_create"); - grpc_channel_args_destroy(args_copy); if (new_args_from_connector != NULL) { grpc_channel_args_destroy(new_args_from_connector); } + if (!resolver) { + GRPC_CHANNEL_INTERNAL_UNREF(&exec_ctx, channel, "subchannel_factory"); + channel = NULL; + } grpc_exec_ctx_finish(&exec_ctx); return channel; |