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.
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); }