commit 62e169aeca69eb81ca613132d9f0c8e24049e892
author Chi Wang <chiwang@google.com> Thu Nov 12 00:26:32 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Nov 12 00:27:38 2020 -0800
tree 964e6d7b3a4865b4ea88b51cf1abcad59cddd57f
parent 38835ebaadcfe151f91caffa241341c6e73de46b

getFromFuture will cancel the future by default on InterruptedException

Fixes #11339.

Closes #12453.

PiperOrigin-RevId: 341993215

src/main/java/com/google/devtools/build/lib/remote/RemoteCache.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteCache.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteCache.java
index 511c5bd..5fc3b3a 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteCache.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteCache.java
@@ -218,7 +218,7 @@
       try {
         if (interruptedException == null) {
           // Wait for all transfers to finish.
-          getFromFuture(transfer);
+          getFromFuture(transfer, cancelRemainingOnInterrupt);
         } else {
           transfer.cancel(true);
         }