aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-07-08 11:41:41 -0700
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-07-08 11:41:41 -0700
commit874e5f87ff5a0129d24dd22b373071fe1c3dcdce (patch)
tree504927debbd0363cd0c2a90645fb779e90d5ffd2
parent9f0724db89d01a6e0eaa6e9c70f95c494357d9e5 (diff)
parentab9f192ce99f8bd53ff30b121558eff4f9cb30d4 (diff)
Merge pull request #2316 from ctiller/tis-but-thy-name
Fix TSAN reported bug
-rw-r--r--src/core/channel/client_channel.c2
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 {