From 960ebfc840b9a63c9ee9ddf1c9ff33ff7fbebebd Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Thu, 25 Aug 2016 00:07:45 +0000 Subject: Revert "Remove usage of to-be-deprecated Throwables methods" Guava snapshot disappeared This reverts commit 9a8395846516d65158b1b2bb59deb9aa6537e820. Change-Id: I2d4e2e2a7394a2081ede6e809e6896402f342221 --- .../com/googlesource/gerrit/plugins/replication/Destination.java | 5 ++--- .../java/com/googlesource/gerrit/plugins/replication/PushOne.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java index b20f8eb..06cbe33 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java @@ -220,8 +220,7 @@ public class Destination { stateLog.error(String.format("source project %s not available", project), err, states); } catch (Exception e) { - Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); + throw Throwables.propagate(e); } return false; } @@ -239,7 +238,7 @@ public class Destination { stateLog.error(String.format("source project %s not available", project), err, states); } catch (Exception e) { - Throwables.throwIfUnchecked(e); + Throwables.propagateIfPossible(e); throw new RuntimeException(e); } return false; diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java index 47867fa..48586eb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java @@ -285,7 +285,7 @@ class PushOne implements ProjectRunnable, CanceledWhileRunning { } }).call(); } catch (Exception e) { - Throwables.throwIfUnchecked(e); + Throwables.propagateIfPossible(e); throw new RuntimeException(e); } finally { statesCleanUp(); -- cgit v1.2.3