From 33687d3983cfbcb332b2b53f87a0b87edf14eb60 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Sat, 17 Aug 2024 10:20:14 -0700 Subject: [PATCH] core: Remove useless NPE check for syncContext in PF It will never throw, because it would only throw if helper is null, but helper is checkNotNull()ed in the constructor. It could have checked for a null return value instead; since it hasn't been, it is clear we don't need this check. --- .../io/grpc/internal/PickFirstLeafLoadBalancer.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java b/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java index 87c0f9c92c..5ff8a50953 100644 --- a/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java +++ b/core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java @@ -33,7 +33,6 @@ import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; import io.grpc.LoadBalancer; import io.grpc.Status; -import io.grpc.SynchronizationContext; import io.grpc.SynchronizationContext.ScheduledHandle; import java.net.SocketAddress; import java.util.ArrayList; @@ -426,16 +425,7 @@ final class PickFirstLeafLoadBalancer extends LoadBalancer { } } - SynchronizationContext synchronizationContext = null; - try { - synchronizationContext = helper.getSynchronizationContext(); - } catch (NullPointerException e) { - // All helpers should have a sync context, but if one doesn't (ex. user had a custom test) - // we don't want to break previously working functionality. - return; - } - - scheduleConnectionTask = synchronizationContext.schedule( + scheduleConnectionTask = helper.getSynchronizationContext().schedule( new StartNextConnection(), CONNECTION_DELAY_INTERVAL_MS, TimeUnit.MILLISECONDS,