Skip to content

Commit 4ee662f

Browse files
committed
xds: cancelled=true on watch close in XdsDepManager
1fd29bc 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.
1 parent 1fd29bc commit 4ee662f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ public void onResourceDoesNotExist(String resourceName) {
525525
}
526526

527527
public void close() {
528+
cancelled = true;
528529
xdsClient.cancelXdsResourceWatch(type, resourceName, this);
529530
}
530531

0 commit comments

Comments
 (0)