fix(alibaba#10585): selectInstances and selectOneHealthyInstance meth…

…ods, if the parameter subscribe is true. Subscription is required when clientProxy.isSubscribe() is false.
Bo-Qiu · Jul 16, 2023 · b446a9e · b446a9e
1 parent 156cd62
commit b446a9e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java b/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
@@ -298,7 +298,7 @@ public List<Instance> selectInstances(String serviceName, String groupName, List
  String clusterString = StringUtils.join(clusters, ",");
  if (subscribe) {
  serviceInfo = serviceInfoHolder.getServiceInfo(serviceName, groupName, clusterString);
- if (null == serviceInfo) {
+ if (null == serviceInfo || !clientProxy.isSubscribed(serviceName, groupName, clusterString)) {
  serviceInfo = clientProxy.subscribe(serviceName, groupName, clusterString);
  }
  } else {
@@ -368,7 +368,7 @@ public Instance selectOneHealthyInstance(String serviceName, String groupName, L
  String clusterString = StringUtils.join(clusters, ",");
  if (subscribe) {
  ServiceInfo serviceInfo = serviceInfoHolder.getServiceInfo(serviceName, groupName, clusterString);
- if (null == serviceInfo) {
+ if (null == serviceInfo || !clientProxy.isSubscribed(serviceName, groupName, clusterString)) {
  serviceInfo = clientProxy.subscribe(serviceName, groupName, clusterString);
  }
  return Balancer.RandomByWeight.selectHost(serviceInfo);