From 23d519172f5759fcbbcca0b49270e263425fd545 Mon Sep 17 00:00:00 2001 From: jrhee17 Date: Mon, 20 Jan 2025 14:44:20 +0900 Subject: [PATCH] minor cleanup --- .../armeria/xds/client/endpoint/ClusterEntry.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xds/src/main/java/com/linecorp/armeria/xds/client/endpoint/ClusterEntry.java b/xds/src/main/java/com/linecorp/armeria/xds/client/endpoint/ClusterEntry.java index bc0bbb2d521..89049aefd70 100644 --- a/xds/src/main/java/com/linecorp/armeria/xds/client/endpoint/ClusterEntry.java +++ b/xds/src/main/java/com/linecorp/armeria/xds/client/endpoint/ClusterEntry.java @@ -45,14 +45,7 @@ public final class ClusterEntry extends AbstractListenable impl @Nullable private final LocalCluster localCluster; private final EventExecutor eventExecutor; - private boolean closing; - private final FunctionSelector lbSelector = new FunctionSelector<>(ctx -> { - final XdsLoadBalancer loadBalancer = this.loadBalancer; - if (loadBalancer == null) { - return null; - } - return loadBalancer; - }); + private final FunctionSelector lbSelector = new FunctionSelector<>(ctx -> loadBalancer); private int refCnt; public ClusterEntry(EventExecutor eventExecutor, @Nullable LocalCluster localCluster) { @@ -71,7 +64,7 @@ public UpdatableLoadBalancer updateClusterSnapshot(ClusterSnapshot clusterSnapsh } final UpdatableLoadBalancer updatableLoadBalancer = new UpdatableLoadBalancer(clusterSnapshot, localCluster, localLoadBalancer, - loadBalancer -> this.notifyListeners(loadBalancer)); + this::notifyListeners); loadBalancer = updatableLoadBalancer; endpointsPool.updateClusterSnapshot(updatableLoadBalancer); lbSelector.refresh(); @@ -108,7 +101,6 @@ List allEndpoints() { @Override public CompletableFuture closeAsync() { - closing = true; if (localCluster != null) { localCluster.clusterEntry().removeListener(localClusterEntryListener); }