aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
diff options
context:
space:
mode:
authorGravatar Juanli Shen <aspirinsjl@gmail.com>2017-12-05 09:46:56 -0800
committerGravatar GitHub <noreply@github.com>2017-12-05 09:46:56 -0800
commit96311af518789adb7743bf63f735087680d460f9 (patch)
tree94d8fcdcd70876d2470c2178622f94852d42a179 /src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
parentecebc90c53a2ad04ce2f460bbd85f8d4d645cf58 (diff)
parentd7ccea8f16f8102a06af5ea43804730b12942f93 (diff)
Merge pull request #13635 from grpc/remove_duplicate_check
Remove duplicate check for shutting_down
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc')
-rw-r--r--src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
index a65f897a2f..db06fc20b6 100644
--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
@@ -1859,7 +1859,7 @@ static void glb_lb_channel_on_connectivity_changed_cb(grpc_exec_ctx* exec_ctx,
grpc_call_cancel(glb_policy->lb_call, nullptr);
// lb_on_server_status_received() will pick up the cancel and reinit
// lb_call.
- } else if (glb_policy->started_picking && !glb_policy->shutting_down) {
+ } else if (glb_policy->started_picking) {
if (glb_policy->retry_timer_active) {
grpc_timer_cancel(exec_ctx, &glb_policy->lb_call_retry_timer);
glb_policy->retry_timer_active = false;