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

xds/internal/balancer/clusterresolver/e2e_test/eds_impl_test.go

@@ -1272,6 +1272,11 @@ func (s) TestEDS_EndpointWithMultipleAddresses(t *testing.T) {
 			// Create bootstrap configuration pointing to the above management server.
 			nodeID := uuid.New().String()
 			bootstrapContents := e2e.DefaultBootstrapContents(t, nodeID, mgmtServer.Address)
+			config, err := bootstrap.NewConfigForTesting(bootstrapContents)
+			if err != nil {
+				t.Fatalf("Failed to create an bootstrap config from contents: %v, %v", bootstrapContents, err)
+			}
+			pool := xdsclient.NewPool(config)
 
 			// Create xDS resources for consumption by the test. We start off with a
 			// single backend in a single EDS locality.
@@ -1288,9 +1293,8 @@ func (s) TestEDS_EndpointWithMultipleAddresses(t *testing.T) {
 
 			// Create an xDS client talking to the above management server, configured
 			// with a short watch expiry timeout.
-			xdsClient, close, err := xdsclient.NewForTesting(xdsclient.OptionsForTesting{
-				Name:     t.Name(),
-				Contents: bootstrapContents,
+			xdsClient, close, err := pool.NewClientForTesting(xdsclient.OptionsForTesting{
+				Name: t.Name(),
 			})
 			if err != nil {
 				t.Fatalf("Failed to create an xDS client: %v", err)

xds/internal/resolver/xds_resolver.go

@@ -85,6 +85,7 @@ func init() {
 
 	rinternal.NewWRR = wrr.NewRandom
 	rinternal.NewXDSClient = func(name string) (xdsclient.XDSClient, func(), error) { return xdsClientPool.NewClient(name) }
+
 }
 
 type xdsResolverBuilder struct {