diff options
author | Mark D. Roth <roth@google.com> | 2018-08-17 08:09:32 -0700 |
---|---|---|
committer | Mark D. Roth <roth@google.com> | 2018-08-17 08:09:32 -0700 |
commit | 4d6f002780e936290ddc629a6eb04a95567f5f8a (patch) | |
tree | 4fccc88e1d29194830df46a2cb1f743fc72155da /src/core/ext/filters | |
parent | 4c4e51d568c8e77f36e832d58407250aba890708 (diff) | |
download | grpc-grpc-4d6f002780e936290ddc629a6eb04a95567f5f8a.tar.gz |
Code review changes and fix threading bug in test.
Diffstat (limited to 'src/core/ext/filters')
-rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc | 11 | ||||
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc | 2 |
2 files changed, 4 insertions, 9 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 fa39d9eb93..464e3fc216 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 @@ -248,14 +248,9 @@ void PickFirst::CancelMatchingPicksLocked(uint32_t initial_metadata_flags_mask, void PickFirst::StartPickingLocked() { started_picking_ = true; - if (subchannel_list_ != nullptr) { - for (size_t i = 0; i < subchannel_list_->num_subchannels(); ++i) { - if (subchannel_list_->subchannel(i)->subchannel() != nullptr) { - subchannel_list_->subchannel(i) - ->CheckConnectivityStateAndStartWatchingLocked(); - break; - } - } + if (subchannel_list_ != nullptr && subchannel_list_->num_subchannels() > 0) { + subchannel_list_->subchannel(0) + ->CheckConnectivityStateAndStartWatchingLocked(); } } diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index d090545d0c..144ac24a56 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -103,8 +103,8 @@ void FakeResolver::NextLocked(grpc_channel_args** target_result, } void FakeResolver::RequestReresolutionLocked() { - grpc_channel_args_destroy(next_results_); if (reresolution_results_ != nullptr) { + grpc_channel_args_destroy(next_results_); next_results_ = grpc_channel_args_copy(reresolution_results_); MaybeFinishNextLocked(); } |