From 7e578ed87c515fdf563cbf2d8397a759c9f25a21 Mon Sep 17 00:00:00 2001
From: Terry Wilson <terrymwilson@gmail.com>
Date: Wed, 25 May 2022 12:40:12 -0700
Subject: [PATCH] xds: Properly assign picker. (#9201)

* xds: Properly assign picker.

Fixes a bug where the picker was not getting used in RpcBehaviorLoadBalancer.
---
 .../integration/RpcBehaviorLoadBalancerProvider.java     | 9 +++++----
 .../integration/RpcBehaviorLoadBalancerProviderTest.java | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java
index f1b1c79d5dd..18431d6336f 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java
@@ -61,9 +61,10 @@ public ConfigOrError parseLoadBalancingPolicyConfig(Map<String, ?> rawLoadBalanc
 
   @Override
   public LoadBalancer newLoadBalancer(Helper helper) {
-    return new RpcBehaviorLoadBalancer(helper,
+    RpcBehaviorHelper rpcBehaviorHelper = new RpcBehaviorHelper(helper);
+    return new RpcBehaviorLoadBalancer(rpcBehaviorHelper,
         LoadBalancerRegistry.getDefaultRegistry().getProvider("round_robin")
-            .newLoadBalancer(helper));
+            .newLoadBalancer(rpcBehaviorHelper));
   }
 
   @Override
@@ -99,8 +100,8 @@ static class RpcBehaviorLoadBalancer extends ForwardingLoadBalancer {
     private final RpcBehaviorHelper helper;
     private final LoadBalancer delegateLb;
 
-    RpcBehaviorLoadBalancer(Helper helper, LoadBalancer delegateLb) {
-      this.helper = new RpcBehaviorHelper(helper);
+    RpcBehaviorLoadBalancer(RpcBehaviorHelper helper, LoadBalancer delegateLb) {
+      this.helper = helper;
       this.delegateLb = delegateLb;
     }
 
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java
index a0534aaf4fe..e19208b8883 100644
--- a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java
+++ b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java
@@ -80,7 +80,8 @@ public void parseInvalidConfig() {
 
   @Test
   public void handleResolvedAddressesDelegated() {
-    RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(mockHelper, mockDelegateLb);
+    RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(new RpcBehaviorHelper(mockHelper),
+        mockDelegateLb);
     ResolvedAddresses resolvedAddresses = buildResolvedAddresses(buildConfig());
     lb.handleResolvedAddresses(resolvedAddresses);
     verify(mockDelegateLb).handleResolvedAddresses(resolvedAddresses);