Reinstantiate delegate after shutdown.

kannanjgithub · kannanjgithub · commit e2a7382b386b · 2025-07-29T14:28:37.000+05:30
diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
@@ -178,11 +178,11 @@ public void handleNameResolutionError(Status error) {
   public void shutdown() {
     logger.log(XdsLogLevel.INFO, "Shutdown");
     delegate.shutdown();
+    delegate = new GracefulSwitchLoadBalancer(helper);
     if (clusterSubscription != null) {
       clusterSubscription.close();
       clusterSubscription = null;
     }
-    delegate = new GracefulSwitchLoadBalancer(helper);
   }
 
   @CheckReturnValue // don't forget to return up the stack after the fail call

Original file line number	Diff line number	Diff line change
`@@ -178,11 +178,11 @@ public void handleNameResolutionError(Status error) {`
`178`	`178`	`public void shutdown() {`
`179`	`179`	`logger.log(XdsLogLevel.INFO, "Shutdown");`
`180`	`180`	`delegate.shutdown();`
	`181`	`+ delegate = new GracefulSwitchLoadBalancer(helper);`
`181`	`182`	`if (clusterSubscription != null) {`
`182`	`183`	`clusterSubscription.close();`
`183`	`184`	`clusterSubscription = null;`
`184`	`185`	`}`
`185`		`- delegate = new GracefulSwitchLoadBalancer(helper);`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@CheckReturnValue // don't forget to return up the stack after the fail call`