diff options
author | Craig Tiller <ctiller@google.com> | 2016-03-21 09:26:33 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-03-21 09:26:33 -0700 |
commit | 255bbfdbe21a984d3629e594d7514736364f9549 (patch) | |
tree | 61b42d2f940345ee81c8776b30bfa85b9ee159b5 /src/core/channel/client_uchannel.c | |
parent | 963c2b757a8576cf0e959bcfedfd03456915a470 (diff) | |
parent | bb644e994708c008f7cf659b01e3fd0c27d5cb6f (diff) |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'src/core/channel/client_uchannel.c')
-rw-r--r-- | src/core/channel/client_uchannel.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/channel/client_uchannel.c b/src/core/channel/client_uchannel.c index 83fcc3a87f..d32327206e 100644 --- a/src/core/channel/client_uchannel.c +++ b/src/core/channel/client_uchannel.c @@ -212,20 +212,10 @@ void grpc_client_uchannel_watch_connectivity_state( grpc_channel *grpc_client_uchannel_create(grpc_subchannel *subchannel, grpc_channel_args *args) { grpc_channel *channel = NULL; -#define MAX_FILTERS 3 - const grpc_channel_filter *filters[MAX_FILTERS]; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - size_t n = 0; - - if (grpc_channel_args_is_census_enabled(args)) { - filters[n++] = &grpc_client_census_filter; - } - filters[n++] = &grpc_compress_filter; - filters[n++] = &grpc_client_uchannel_filter; - GPR_ASSERT(n <= MAX_FILTERS); channel = - grpc_channel_create_from_filters(&exec_ctx, NULL, filters, n, args, 1); + grpc_channel_create(&exec_ctx, NULL, args, GRPC_CLIENT_UCHANNEL, NULL); return channel; } |