From a96c5535f76b1233c7d3c71dd54169fc51368dee Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Thu, 7 Apr 2016 19:27:38 +0900
Subject: [PATCH] gerrit-sshd: Remove usages of Throwables#propagate

Change Ic0e0819b5 added some calls to Throwables#propagate, but I
overlooked that previously existing usages had been replaced in
change Id148cb961 due to intention of Guava to deprecate it.

Change-Id: I90e513c85da4fecbe22679ebbf45badbf3a9edde
---
 .../src/main/java/com/google/gerrit/sshd/AliasCommand.java     | 3 ++-
 .../src/main/java/com/google/gerrit/sshd/DispatchCommand.java  | 3 ++-
 gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java
index efdfae9591..dac02631df 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommand.java
@@ -99,7 +99,8 @@ public class AliasCommand extends BaseCommand {
       try {
         cmd.destroy();
       } catch (Exception e) {
-        Throwables.propagate(e);
+        Throwables.propagateIfPossible(e);
+        throw new RuntimeException(e);
       }
     }
   }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
index 3890f1c509..64fc48aafe 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
@@ -137,7 +137,8 @@ final class DispatchCommand extends BaseCommand {
       try {
         cmd.destroy();
       } catch (Exception e) {
-        Throwables.propagate(e);
+        Throwables.propagateIfPossible(e);
+        throw new RuntimeException(e);
       }
     }
   }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java
index 26ad50fbb2..89b8014efc 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java
@@ -155,7 +155,8 @@ public final class SuExec extends BaseCommand {
       try {
         cmd.destroy();
       } catch (Exception e) {
-        Throwables.propagate(e);
+        Throwables.propagateIfPossible(e);
+        throw new RuntimeException(e);
       }
     }
   }