commit 4ee662fbcf5cb9b1d3da6b046536890db69e4bc5
author Eric Anderson <ejona@google.com> Sat Jun 07 07:23:09 2025 -0700
committer Eric Anderson <ejona@google.com> Mon Jun 09 14:13:41 2025 +0000
tree 46f943d1fc9bf31d726169db0a6cba4c740af29e
parent 1fd29bc804d0820a8f72c061bd671811adf85546

xds: cancelled=true on watch close in XdsDepManager

1fd29bc80 replaced cancelWatcher() with watcher.close(). But setting
cancelled was missing. Because the config update checks for shutdown,
the cancelled flag no longer avoids exceptions. But it seems best to
continue avoiding any processing after close to avoid surprises.

xds/src/main/java/io/grpc/xds/XdsDependencyManager.java

diff --git a/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java b/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
index 78d4dbb..c0054c1 100644
--- a/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
+++ b/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
@@ -525,6 +525,7 @@
     }
 
     public void close() {
+      cancelled = true;
       xdsClient.cancelXdsResourceWatch(type, resourceName, this);
     }