From 18e1887a76fb6ebf58c8b0085a83f5718b04eaff Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulf@engflow.com>
Date: Mon, 22 Mar 2021 02:01:26 -0700
Subject: [PATCH] Fix order of build request id and command id

They should be in this order rather than the other way round.

See `RemoteServerCapabilities.get`.

Change-Id: I4be952cc2ad43ae35c7052bd26b153b1e887e562

Closes #13237.

Change-Id: I4be952cc2ad43ae35c7052bd26b153b1e887e562
PiperOrigin-RevId: 364266202
---
 .../java/com/google/devtools/build/lib/remote/RemoteModule.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
index 5791445c086c7e..350e1afa51c49b 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -175,7 +175,7 @@ private static void verifyServerCapabilities(
             retrier);
     ServerCapabilities capabilities = null;
     try {
-      capabilities = rsc.get(env.getCommandId().toString(), env.getBuildRequestId());
+      capabilities = rsc.get(env.getBuildRequestId(), env.getCommandId().toString());
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       return;