commit 4f008c5f15d017504e289b6598be68091d7b4e73
author Ulf Adams <ulf@engflow.com> Thu Sep 17 01:17:59 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Sep 17 01:19:04 2020 -0700
tree ebe0e937770ba1a04d39a7b05958a87ee03d5b11
parent e3285b8b4593a0672284e577de79d368a50d8596

Simplify RemoteExecutionCache

This is in preparation for adding an additional cache to RemoteExecutionCache
to deduplicate file uploads.

Progress on #12113.

Change-Id: I3cffc5acc0bfb1b26e908f8edf44e30a4be0db86

Closes #12114.

Change-Id: I3cffc5acc0bfb1b26e908f8edf44e30a4be0db86
PiperOrigin-RevId: 332182515

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 6a0b501..2d66369 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
@@ -206,13 +206,13 @@
     }
   }
 
-  public static <T> void waitForBulkTransfer(
-      Iterable<ListenableFuture<T>> transfers, boolean cancelRemainingOnInterrupt)
+  public static void waitForBulkTransfer(
+      Iterable<? extends ListenableFuture<?>> transfers, boolean cancelRemainingOnInterrupt)
       throws BulkTransferException, InterruptedException {
     BulkTransferException bulkTransferException = null;
     InterruptedException interruptedException = null;
     boolean interrupted = Thread.currentThread().isInterrupted();
-    for (ListenableFuture<T> transfer : transfers) {
+    for (ListenableFuture<?> transfer : transfers) {
       try {
         if (interruptedException == null) {
           // Wait for all transfers to finish.