Merge branch 'xds_watcher_api_change' into xds_watcher_api_change2

markdroth · Dec 27, 2024 · 4644141 · 4644141
2 parents 16a9341 + 1424fc1
commit 4644141
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc
@@ -547,10 +547,10 @@ void XdsClient::XdsChannel::SetChannelStatusLocked(absl::Status status) {
         MaybeFallbackLocked(a.first, a.second)) {
       continue;
     }
-    for (const auto& t : a.second.resource_map) {    // type
-      for (const auto& r : t.second) {               // resource id
-        auto& watchers = r.second.HasResource() ? watchers_cached
-                                                : watchers_uncached;
+    for (const auto& t : a.second.resource_map) {  // type
+      for (const auto& r : t.second) {             // resource id
+        auto& watchers =
+            r.second.HasResource() ? watchers_cached : watchers_uncached;
         for (const auto& w : r.second.watchers()) {  // watchers
           watchers.insert(w);
         }
@@ -1032,9 +1032,9 @@ void XdsClient::XdsChannel::AdsCall::ParseResource(
     // If we previously had connectivity problems, notify watchers that
     // the ambient error has been cleared.
     if (!xds_channel()->status().ok()) {
-      xds_client()->NotifyWatchersOnAmbientError(
-          absl::OkStatus(), resource_state.watchers(),
-          context->read_delay_handle);
+      xds_client()->NotifyWatchersOnAmbientError(absl::OkStatus(),
+                                                 resource_state.watchers(),
+                                                 context->read_delay_handle);
     }
     return;
   }