1 files changed, 20 insertions, 19 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index 6b024b58aa..12d77f206b 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -82,6 +82,7 @@ import java.time.Duration;
 import java.util.Collection;
 import java.util.SortedMap;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -168,7 +169,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -228,7 +229,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -282,7 +283,7 @@ public class RemoteSpawnRunnerTest {
                 execRoot,
                 options,
                 Options.getDefaults(ExecutionOptions.class),
-                localRunner,
+                new AtomicReference<>(localRunner),
                 true,
                 /*cmdlineReporter=*/ null,
                 "build-req-id",
@@ -333,7 +334,7 @@ public class RemoteSpawnRunnerTest {
                 execRoot,
                 options,
                 Options.getDefaults(ExecutionOptions.class),
-                localRunner,
+                new AtomicReference<>(localRunner),
                 true,
                 /*cmdlineReporter=*/ null,
                 "build-req-id",
@@ -369,7 +370,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             false,
             reporter,
             "build-req-id",
@@ -427,7 +428,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -468,7 +469,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -506,7 +507,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -543,7 +544,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             Options.getDefaults(RemoteOptions.class),
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -585,7 +586,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             Options.getDefaults(RemoteOptions.class),
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -630,7 +631,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             Options.getDefaults(RemoteOptions.class),
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -670,7 +671,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             Options.getDefaults(RemoteOptions.class),
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -712,7 +713,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -755,7 +756,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -804,7 +805,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -851,7 +852,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -893,7 +894,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -931,7 +932,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             options,
             Options.getDefaults(ExecutionOptions.class),
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",
@@ -966,7 +967,7 @@ public class RemoteSpawnRunnerTest {
             execRoot,
             Options.getDefaults(RemoteOptions.class),
             executionOptions,
-            localRunner,
+            new AtomicReference<>(localRunner),
             true,
             /*cmdlineReporter=*/ null,
             "build-req-id",