From f0231ba07eff19085ef4cf53f4802ba23fddd2bb Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 23 Sep 2016 14:14:47 -0700
Subject: [PATCH] Fix bug from merge.
---
src/core/ext/client_config/client_channel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/ext/client_config/client_channel.c b/src/core/ext/client_config/client_channel.c
index e5ec69ab1a..50a7f4467f 100644
--- a/src/core/ext/client_config/client_channel.c
+++ b/src/core/ext/client_config/client_channel.c
@@ -183,7 +183,7 @@ static void on_resolver_result_changed(grpc_exec_ctx *exec_ctx, void *arg,
if (chand->incoming_resolver_result != NULL) {
grpc_lb_policy_args lb_policy_args;
lb_policy_args.server_name =
- grpc_resolver_result_get_server_name(chand->resolver_result);
+ grpc_resolver_result_get_server_name(chand->incoming_resolver_result);
lb_policy_args.addresses =
grpc_resolver_result_get_addresses(chand->incoming_resolver_result);
lb_policy_args.additional_args = grpc_resolver_result_get_lb_policy_args(
--
GitLab