Re-enabling the remote caching without remote execution code path, which was

accidentally regressed.

TESTED=local RemoteWorker without work_path
RELNOTES: n/a
PiperOrigin-RevId: 152806430

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
index df91471a5a..0391baddb2 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnStrategy.java
@@ -223,10 +223,6 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
       standaloneStrategy.exec(spawn, actionExecutionContext);
       return;
     }
-    if (workExecutor == null) {
-      execLocally(spawn, actionExecutionContext, actionCache, actionKey);
-      return;
-    }
     if (executor.reportsSubcommands()) {
       executor.reportSubcommand(spawn);
     }
@@ -269,6 +265,11 @@ final class RemoteSpawnStrategy implements SpawnActionContext {
         }
       }
 
+      if (workExecutor == null) {
+        execLocally(spawn, actionExecutionContext, actionCache, actionKey);
+        return;
+      }
+
       // Upload the command and all the inputs into the remote cache.
       actionCache.uploadBlob(command.toByteArray());
       // TODO(olaola): this should use the ActionInputFileCache for SHA1 digests!