From 283f04983ba83c5c25ac5744979f543494230a13 Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Wed, 13 Mar 2019 16:54:10 -0700 Subject: [PATCH] core: reorder code in NameResolver.Listener.onAddress() --- .../io/grpc/internal/ManagedChannelImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 6c24474cfa..01fdbd4fa9 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -1295,10 +1295,6 @@ final class ManagedChannelImpl extends ManagedChannel implements channelLogger.log(ChannelLogLevel.INFO, "Service config changed"); lastServiceConfig = serviceConfig; } - // Call LB only if it's not shutdown. If LB is shutdown, lbHelper won't match. - if (NameResolverListenerImpl.this.helper != ManagedChannelImpl.this.lbHelper) { - return; - } nameResolverBackoffPolicy = null; @@ -1316,11 +1312,14 @@ final class ManagedChannelImpl extends ManagedChannel implements } } - if (servers.isEmpty() && !helper.lb.canHandleEmptyAddressListFromNameResolution()) { - handleErrorInSyncContext(Status.UNAVAILABLE.withDescription( - "Name resolver " + resolver + " returned an empty list")); - } else { - helper.lb.handleResolvedAddressGroups(servers, config); + // Call LB only if it's not shutdown. If LB is shutdown, lbHelper won't match. + if (NameResolverListenerImpl.this.helper == ManagedChannelImpl.this.lbHelper) { + if (servers.isEmpty() && !helper.lb.canHandleEmptyAddressListFromNameResolution()) { + handleErrorInSyncContext(Status.UNAVAILABLE.withDescription( + "Name resolver " + resolver + " returned an empty list")); + } else { + helper.lb.handleResolvedAddressGroups(servers, config); + } } } }