unconditionally check currentSubscriber

apple · Jul 13, 2024 · 3cf255f · 3cf255f
1 parent d48d8f5
commit 3cf255f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...dbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/DefaultLoadBalancer.java b/...dbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/DefaultLoadBalancer.java
@@ -296,7 +296,7 @@ private void sequentialOnNext(Collection<? extends ServiceDiscovererEvent<Resolv
             // (https://github.com/reactive-streams/reactive-streams-jvm?tab=readme-ov-file#1.8) new events will
             // stop eventually but not guaranteed to stop immediately after cancellation or could race with cancel.
             // Therefore, we should check that this is the current Subscriber before processing new events.
-            if (healthCheckConfig != null && currentSubscriber != this) {
+            if (currentSubscriber != this) {
                 LOGGER.debug("{}: received new events after cancelling previous subscription, discarding: {}",
                         DefaultLoadBalancer.this, events);
                 return;

diff --git a/...cetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java b/...cetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancer.java
@@ -285,7 +285,7 @@ public void onNext(@Nullable final Collection<? extends ServiceDiscovererEvent<R
             // (https://github.com/reactive-streams/reactive-streams-jvm?tab=readme-ov-file#1.8) new events will
             // stop eventually but not guaranteed to stop immediately after cancellation or could race with cancel.
             // Therefore, we should check that this is the current Subscriber before processing new events.
-            if (healthCheckConfig != null && currentSubscriber != this) {
+            if (currentSubscriber != this) {
                 LOGGER.debug("{}: received new events after cancelling previous subscription, discarding: {}",
                         RoundRobinLoadBalancer.this, events);
                 return;