Fix problem after merge.

kannanjgithub · kannanjgithub · commit 8c1199d9f44b · 2025-07-29T15:29:28.000+05:30
diff --git a/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancerProvider.java
@@ -88,7 +88,7 @@ boolean isHttp11ProxyAvailable() {
 
     @Override
     public int hashCode() {
-      return Objects.hash(discoveryMechanisms, lbConfig, isHttp11ProxyAvailable);
+      return Objects.hash(discoveryMechanism, lbConfig, isHttp11ProxyAvailable);
     }
 
     @Override
@@ -100,7 +100,7 @@ public boolean equals(Object o) {
         return false;
       }
       ClusterResolverConfig that = (ClusterResolverConfig) o;
-      return discoveryMechanisms.equals(that.discoveryMechanisms)
+      return discoveryMechanism.equals(that.discoveryMechanism)
           && lbConfig.equals(that.lbConfig)
           && isHttp11ProxyAvailable == that.isHttp11ProxyAvailable;
     }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ boolean isHttp11ProxyAvailable() {`
`88`	`88`
`89`	`89`	`@Override`
`90`	`90`	`public int hashCode() {`
`91`		`- return Objects.hash(discoveryMechanisms, lbConfig, isHttp11ProxyAvailable);`
	`91`	`+ return Objects.hash(discoveryMechanism, lbConfig, isHttp11ProxyAvailable);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`@@ -100,7 +100,7 @@ public boolean equals(Object o) {`
`100`	`100`	`return false;`
`101`	`101`	`}`
`102`	`102`	`ClusterResolverConfig that = (ClusterResolverConfig) o;`
`103`		`- return discoveryMechanisms.equals(that.discoveryMechanisms)`
	`103`	`+ return discoveryMechanism.equals(that.discoveryMechanism)`
`104`	`104`	`&& lbConfig.equals(that.lbConfig)`
`105`	`105`	`&& isHttp11ProxyAvailable == that.isHttp11ProxyAvailable;`
`106`	`106`	`}`