[ISSUE #42] 没有可用服务时，客户端线程会hang住

polarismesh · Apr 19, 2023 · ea97821 · ea97821
1 parent 3f6a646
commit ea97821
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/grpc-java-polaris/src/main/java/com/tencent/polaris/grpc/resolver/PolarisNameResolver.java b/grpc-java-polaris/src/main/java/com/tencent/polaris/grpc/resolver/PolarisNameResolver.java
@@ -149,23 +149,21 @@ private void doWatch(Listener2 listener) {
 
     private void notifyListener(Listener2 listener, InstancesResponse response) {
         ServiceInstances serviceInstances = response.toServiceInstances();
-        if (!serviceInstances.getInstances().isEmpty()) {
-            List<EquivalentAddressGroup> equivalentAddressGroups = serviceInstances.getInstances()
-                    .stream()
-                    .map(this::buildEquivalentAddressGroup)
-                    .collect(Collectors.toList());
+	List<EquivalentAddressGroup> equivalentAddressGroups = serviceInstances.getInstances()
+                .stream()
+                .map(this::buildEquivalentAddressGroup)
+                .collect(Collectors.toList());
 
-            Attributes.Builder builder = Attributes.newBuilder();
+        Attributes.Builder builder = Attributes.newBuilder();
 
-            if (sourceService != null) {
-                builder.set(Common.SOURCE_SERVICE_INFO, sourceService);
-            }
-
-            listener.onResult(ResolutionResult.newBuilder()
-                    .setAddresses(equivalentAddressGroups)
-                    .setAttributes(builder.build())
-                    .build());
+        if (sourceService != null) {
+            builder.set(Common.SOURCE_SERVICE_INFO, sourceService);
         }
+
+        listener.onResult(ResolutionResult.newBuilder()
+                .setAddresses(equivalentAddressGroups)
+                .setAttributes(builder.build())
+                .build());
     }
 
     @Override