nil check for r.cc in r.onError, before calling r.cc.ReportError(err)

grpc · Dec 21, 2024 · 8cade2a · 8cade2a
1 parent d11cf5f
commit 8cade2a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/xds/internal/resolver/xds_resolver.go b/xds/internal/resolver/xds_resolver.go
@@ -460,6 +460,10 @@ func (r *xdsResolver) applyRouteConfigUpdate(update xdsresource.RouteConfigUpdat
 //
 // Only executed in the context of a serializer callback.
 func (r *xdsResolver) onError(err error) {
+	if r.cc == nil {
+		r.logger.Warningf("Resolver closed, dropping error: %v", err)
+		return
+	}
 	r.cc.ReportError(err)
 }