Skip to content

Commit d807492

Browse files
committed
address comment
1 parent 502055c commit d807492

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,7 @@ private <T extends ResourceUpdate> void handleResourceUpdate(
610610
// When xdsDataErrorHandlingEnabled is true and fail_on_data_errors is present,
611611
// delete cached data so onError will call onResourceChanged instead of onAmbientError.
612612
// When xdsDataErrorHandlingEnabled is false, use old behavior (always keep cached data).
613-
boolean xdsDataErrorHandlingEnabled =
614-
io.grpc.xds.client.BootstrapperImpl.xdsDataErrorHandlingEnabled;
615-
if (xdsDataErrorHandlingEnabled && subscriber.data != null
613+
if (BootstrapperImpl.xdsDataErrorHandlingEnabled && subscriber.data != null
616614
&& args.serverInfo.failOnDataErrors()) {
617615
subscriber.data = null;
618616
}
@@ -879,8 +877,7 @@ void onAbsent(@Nullable ProcessingTracker processingTracker, ServerInfo serverIn
879877
// When xdsDataErrorHandlingEnabled is false, use the old behavior (ignore_resource_deletion).
880878
boolean ignoreResourceDeletionEnabled = serverInfo.ignoreResourceDeletion();
881879
boolean failOnDataErrors = serverInfo.failOnDataErrors();
882-
boolean xdsDataErrorHandlingEnabled =
883-
io.grpc.xds.client.BootstrapperImpl.xdsDataErrorHandlingEnabled;
880+
boolean xdsDataErrorHandlingEnabled = BootstrapperImpl.xdsDataErrorHandlingEnabled;
884881

885882
if (type.isFullStateOfTheWorld() && data != null) {
886883
// New behavior (per gRFC A88): Default is to treat deletions as ambient errors

0 commit comments

Comments
 (0)