commit b20130ea6138a8e2c2e10cfbe65bd4d6f8788eba
author Ulf Adams <ulfjack@gmail.com> Wed Mar 04 08:52:57 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Mar 04 08:54:21 2020 -0800
tree 2ab18861d9715350e28124ef3b47044199c8481d
parent 9374d7015544a9dcc5a6e160276ab707a0d94027

Avoid deprecated Guava methods in {Remote,}Retrier

Change-Id: Ibe3c7119a1dfe171e2f63e1a947bc94a07a03ac4

Closes #10899.

Change-Id: Ibe3c7119a1dfe171e2f63e1a947bc94a07a03ac4
PiperOrigin-RevId: 298861287

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

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteRetrier.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteRetrier.java
index fc8064f..7bb163a 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteRetrier.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteRetrier.java
@@ -107,16 +107,18 @@
 
   /**
    * Execute a callable with retries. {@link IOException} and {@link InterruptedException} are
-   * propagated directly to the caller. All other exceptions are wrapped in {@link RuntimeError}.
+   * propagated directly to the caller. All other exceptions are wrapped in {@link
+   * RuntimeException}.
    */
   @Override
   public <T> T execute(Callable<T> call) throws IOException, InterruptedException {
     try {
       return super.execute(call);
     } catch (Exception e) {
-      Throwables.propagateIfInstanceOf(e, IOException.class);
-      Throwables.propagateIfInstanceOf(e, InterruptedException.class);
-      throw Throwables.propagate(e);
+      Throwables.throwIfInstanceOf(e, IOException.class);
+      Throwables.throwIfInstanceOf(e, InterruptedException.class);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 

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

diff --git a/src/main/java/com/google/devtools/build/lib/remote/Retrier.java b/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
index 949050d..9fa0208 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
@@ -239,7 +239,7 @@
         return r;
       } catch (Exception e) {
         circuitBreaker.recordFailure();
-        Throwables.propagateIfInstanceOf(e, InterruptedException.class);
+        Throwables.throwIfInstanceOf(e, InterruptedException.class);
         if (State.TRIAL_CALL.equals(circuitState)) {
           throw e;
         }