Merge pull request #24162 from markdroth/xds_segfault_fix

Fix cut-and-paste error and change test to catch this kind of bug.
5 years ago · eaee09913f
parent 7862366047 4bb00c25c0
commit eaee09913f
2 changed files with 328 additions and 208 deletions
--- a/src/core/ext/xds/xds_client.cc
+++ b/src/core/ext/xds/xds_client.cc
@ -969,7 +969,7 @@ void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate(
            " resources",
            xds_client(), rds_update_map.size());
  }
-  auto& rds_state = state_map_[XdsApi::kLdsTypeUrl];
+  auto& rds_state = state_map_[XdsApi::kRdsTypeUrl];
  for (auto& p : rds_update_map) {
    const std::string& route_config_name = p.first;
    XdsApi::RdsUpdate& rds_update = p.second;
--- a/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc