Fix the bug of setting the wrong field.

Author: voidzcy

xds/src/main/java/io/grpc/xds/XdsNameResolver.java

@@ -355,23 +355,22 @@ public Result selectConfig(PickSubchannelArgs args) {
         }
       } while (!retainCluster(cluster));
       // TODO(chengyuanzhang): avoid service config generation and parsing for each call.
-      Object config = null;
       long timeoutNano = selectedRoute.getRouteAction().getTimeoutNano();
       if (timeoutNano == 0) {
         timeoutNano = fallbackTimeoutNano;
       }
+      Map<String, ?> rawServiceConfig = Collections.emptyMap();
       if (timeoutNano > 0) {
-        Map<String, ?> rawServiceConfig =
-            generateServiceConfigWithMethodTimeoutConfig(timeoutNano);
-        ConfigOrError parsedServiceConfig =
-            serviceConfigParser.parseServiceConfig(rawServiceConfig);
-        config = parsedServiceConfig.getConfig();
-        if (config == null) {
-          releaseCluster(cluster);
-          return Result.forError(
-              parsedServiceConfig.getError().augmentDescription(
-                  "Failed to parse service config (method config)"));
-        }
+        rawServiceConfig = generateServiceConfigWithMethodTimeoutConfig(timeoutNano);
+      }
+      ConfigOrError parsedServiceConfig =
+          serviceConfigParser.parseServiceConfig(rawServiceConfig);
+      Object config = parsedServiceConfig.getConfig();
+      if (config == null) {
+        releaseCluster(cluster);
+        return Result.forError(
+            parsedServiceConfig.getError().augmentDescription(
+                "Failed to parse service config (method config)"));
       }
       final String finalCluster = cluster;
       class SelectionCompleted implements Runnable {
@@ -381,14 +380,12 @@ public void run() {
         }
       }
 
-      Result.Builder resultBuilder =
+      return
           Result.newBuilder()
               .setCallOptions(args.getCallOptions().withOption(CLUSTER_SELECTION_KEY, cluster))
-          .setCommittedCallback(new SelectionCompleted());
-      if (config != null) {
-        resultBuilder.setConfig(config);
-      }
-      return resultBuilder.build();
+              .setConfig(config)
+              .setCommittedCallback(new SelectionCompleted())
+              .build();
     }
 
     private boolean retainCluster(String cluster) {
@@ -448,7 +445,7 @@ public void onChanged(LdsUpdate update) {
       }
       cleanUpRdsWatcher();
       if (virtualHosts != null) {
-        updateRoutes(virtualHosts, httpMaxStreamDurationNano);
+        updateRoutes(virtualHosts);
       } else {
         rdsResource = rdsName;
         rdsWatcher = new RdsResourceWatcherImpl();
@@ -483,7 +480,7 @@ private void stop() {
       xdsClient.cancelLdsResourceWatch(authority, this);
     }
 
-    private void updateRoutes(List<VirtualHost> virtualHosts, long fallbackTimeoutNano) {
+    private void updateRoutes(List<VirtualHost> virtualHosts) {
       VirtualHost virtualHost = findVirtualHostForHostName(virtualHosts, authority);
       if (virtualHost == null) {
         logger.log(XdsLogLevel.WARNING,
@@ -552,7 +549,7 @@ private class RdsResourceWatcherImpl implements RdsResourceWatcher {
 
       @Override
       public void onChanged(RdsUpdate update) {
-        updateRoutes(update.getVirtualHosts(), httpMaxStreamDurationNano);
+        updateRoutes(update.getVirtualHosts());
       }
 
       @Override

xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java

@@ -290,6 +290,7 @@ private List<VirtualHost> buildUnmatchedVirtualHosts() {
             Collections.singletonList(route2)));
   }
 
+  @SuppressWarnings("unchecked")
   @Test
   public void resolved_noTimeout() {
     resolver.start(mockListener);
@@ -307,7 +308,7 @@ public void resolved_noTimeout() {
     assertThat(selectResult.getStatus().isOk()).isTrue();
     assertThat(selectResult.getCallOptions().getOption(XdsNameResolver.CLUSTER_SELECTION_KEY))
         .isEqualTo(cluster1);
-    assertThat(selectResult.getConfig()).isNull();
+    assertThat((Map<String, ?>) selectResult.getConfig()).isEmpty();
   }
 
   @Test