merge conflict took old method handleConfigNotFound()

shivaspeaks · shivaspeaks · commit 02e8217606ca · 2025-05-05T15:21:20.000+05:30
diff --git a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java
@@ -392,7 +392,7 @@ public void onResourceChanged(StatusOr<LdsUpdate> updateOrError) {
         StatusException statusException = error.withDescription(
                 error.getDescription() + " xDS node ID: "
                     + xdsClient.getBootstrapInfo().node().getId()).asException();
-        handleConfigNotFound(statusException);
+        handleConfigNotFoundOrMismatch(statusException);
         return;
       }
       LdsUpdate update = updateOrError.getValue();

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ public void onResourceChanged(StatusOr<LdsUpdate> updateOrError) {`
`392`	`392`	`StatusException statusException = error.withDescription(`
`393`	`393`	`error.getDescription() + " xDS node ID: "`
`394`	`394`	`+ xdsClient.getBootstrapInfo().node().getId()).asException();`
`395`		`- handleConfigNotFound(statusException);`
	`395`	`+ handleConfigNotFoundOrMismatch(statusException);`
`396`	`396`	`return;`
`397`	`397`	`}`
`398`	`398`	`LdsUpdate update = updateOrError.getValue();`