flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Make XdsNR.RoutingConfig.empty a constant 

The field was made final in 4b52639aa but was soon reverted in 3ebb3e192
because of what I assume was a bad merge conflict resolution. The field
has contained an immutable object since its introduction in d25f5acf1,
so it is pretty likely to remain a constant in the future.
This commit is contained in:
Eric Anderson 2025-01-30 13:27:02 -08:00
parent c506190b0f
commit 04f1cc5845
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View File

@ -129,7 +129,7 @@ final class XdsNameResolver extends NameResolver {
private final long randomChannelId; private final long randomChannelId;
private final MetricRecorder metricRecorder; private final MetricRecorder metricRecorder;
private volatile RoutingConfig routingConfig = RoutingConfig.empty; private volatile RoutingConfig routingConfig = RoutingConfig.EMPTY;
private Listener2 listener; private Listener2 listener;
private ObjectPool<XdsClient> xdsClientPool; private ObjectPool<XdsClient> xdsClientPool;
private XdsClient xdsClient; private XdsClient xdsClient;
@ -856,7 +856,7 @@ final class XdsNameResolver extends NameResolver {
} }
existingClusters = null; existingClusters = null;
} }
routingConfig = RoutingConfig.empty; routingConfig = RoutingConfig.EMPTY;
// Without addresses the default LB (normally pick_first) should become TRANSIENT_FAILURE, and // Without addresses the default LB (normally pick_first) should become TRANSIENT_FAILURE, and
// the config selector handles the error message itself. Once the LB API allows providing // the config selector handles the error message itself. Once the LB API allows providing
// failure information for addresses yet still providing a service config, the config seector // failure information for addresses yet still providing a service config, the config seector
@ -938,7 +938,7 @@ final class XdsNameResolver extends NameResolver {
private final long fallbackTimeoutNano; private final long fallbackTimeoutNano;
final ImmutableList<RouteData> routes; final ImmutableList<RouteData> routes;
private static RoutingConfig empty = new RoutingConfig(0, ImmutableList.of()); private static final RoutingConfig EMPTY = new RoutingConfig(0, ImmutableList.of());
private RoutingConfig(long fallbackTimeoutNano, ImmutableList<RouteData> routes) { private RoutingConfig(long fallbackTimeoutNano, ImmutableList<RouteData> routes) {
this.fallbackTimeoutNano = fallbackTimeoutNano; this.fallbackTimeoutNano = fallbackTimeoutNano;