From 939814705c9bcd5027c2d7f1ca8f34427df4d86e Mon Sep 17 00:00:00 2001
From: xingrufei <xingrufei@sogou-inc.com>
Date: Wed, 4 Aug 2021 15:39:44 +0800
Subject: [PATCH] fix ClusterState.result may be null in CdsLoadBalancer2

---
 xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
index e91e76090abf..abec1151f016 100644
--- a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
+++ b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
@@ -185,7 +185,7 @@ private void handleClusterDiscovered() {
       }
       LoadBalancerProvider lbProvider = null;
       Object lbConfig = null;
-      if (root.result.lbPolicy() == LbPolicy.RING_HASH) {
+      if (root.result != null && root.result.lbPolicy() == LbPolicy.RING_HASH) {
         lbProvider = lbRegistry.getProvider("ring_hash");
         lbConfig = new RingHashConfig(root.result.minRingSize(), root.result.maxRingSize());
       } else {