diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-07-08 13:01:41 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-07-08 13:01:41 -0700 |
| commit | 3fbb984722712d3712d9c4fe3e95af71b66f7b48 (patch) | |
| tree | fc2629e9b121d3bd4d212da9616e12de56c0bfcf /src/core/channel/client_channel.c | |
| parent | 5a79053244e60d794c26094de6d1f07b2a4ba233 (diff) | |
| parent | 874e5f87ff5a0129d24dd22b373071fe1c3dcdce (diff) | |
Merge branch 'master' into makefile_pkg-config_libs_fix
Diffstat (limited to 'src/core/channel/client_channel.c')
| -rw-r--r-- | src/core/channel/client_channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 871e970eb8..f890f99237 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -427,7 +427,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { GRPC_RESOLVER_REF(resolver, "channel-next"); gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - grpc_resolver_next(chand->resolver, &chand->incoming_configuration, + grpc_resolver_next(resolver, &chand->incoming_configuration, &chand->on_config_changed); GRPC_RESOLVER_UNREF(resolver, "channel-next"); } else { |