diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-01-12 14:01:38 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-01-12 14:01:38 -0800 |
| commit | be1b7f986e55756ac83b3807ee1d73929fbb3546 (patch) | |
| tree | 0f5e6a8ae23618882ec3426ec3687d34abff84a6 /src/core/ext/filters/client_channel/lb_policy/pick_first | |
| parent | dfa2851462809a459dd734090c221ea322064c7d (diff) | |
PR comments, round 3
Diffstat (limited to 'src/core/ext/filters/client_channel/lb_policy/pick_first')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index c91a305f33..725b78d478 100644 --- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -294,7 +294,7 @@ static void pf_update_locked(grpc_lb_policy* policy, p, p->selected->subchannel, i, subchannel_list->num_subchannels); } - if (p->selected->connected_subchannel) { + if (p->selected->connected_subchannel != nullptr) { sd->connected_subchannel = p->selected->connected_subchannel; } p->selected = sd; @@ -458,8 +458,6 @@ static void pf_connectivity_changed_locked(void* arg, grpc_error* error) { // Cases 1 and 2. grpc_connectivity_state_set(&p->state_tracker, GRPC_CHANNEL_READY, GRPC_ERROR_NONE, "connecting_ready"); - sd->connected_subchannel = - grpc_subchannel_get_connected_subchannel(sd->subchannel); p->selected = sd; if (grpc_lb_pick_first_trace.enabled()) { gpr_log(GPR_INFO, "Pick First %p selected subchannel %p", (void*)p, |