Do not set ATTR_LB_ADDR if not balancer addresses specified for test,…

… mirror what DnsNameResolver is doing.
grpc · Jan 28, 2020 · a9d6a40 · a9d6a40
1 parent 3fccafe
commit a9d6a40
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java
@@ -2356,15 +2356,17 @@ private void deliverResolvedAddresses(
       final List<EquivalentAddressGroup> backendAddrs,
       final List<EquivalentAddressGroup> balancerAddrs,
       Attributes attrs) {
-    final Attributes attributes =
-        attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDRS, balancerAddrs).build();
+    if (!balancerAddrs.isEmpty()) {
+      attrs = attrs.toBuilder().set(GrpclbConstants.ATTR_LB_ADDRS, balancerAddrs).build();
+    }
+    final Attributes finalAttrs = attrs;
     syncContext.execute(new Runnable() {
       @Override
       public void run() {
         balancer.handleResolvedAddresses(
             ResolvedAddresses.newBuilder()
                 .setAddresses(backendAddrs)
-                .setAttributes(attributes)
+                .setAttributes(finalAttrs)
                 .build());
       }
     });