commit d6f9e9c498d0abe65fe3d0a454350950260d49ea
author Maxime Guerreiro <maximeg@google.com> Fri Apr 27 13:21:43 2018 +0000
committer Maxime Guerreiro <maximeg@google.com> Fri Apr 27 13:36:37 2018 +0000
tree dc8273620d8af3caac070fe6afa32553fe81027d
parent 54f8947d775aef937d3fcd0b6908caf61a7951b4

Collapse catch blocks when possible

Change-Id: I139ec81fc96b47de467ba0bcbaae6f6a0cce04b1

java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java

diff --git a/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
index 4000610..a971fc3 100644
--- a/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
+++ b/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
@@ -172,10 +172,7 @@
         pape.setMaxAuthAge(papeMaxAuthAge);
         aReq.addExtension(pape);
       }
-    } catch (MessageException e) {
-      log.error("Cannot create OpenID redirect for " + openidIdentifier, e);
-      return new DiscoveryResult(DiscoveryResult.Status.ERROR);
-    } catch (ConsumerException e) {
+    } catch (MessageException | ConsumerException e) {
       log.error("Cannot create OpenID redirect for " + openidIdentifier, e);
       return new DiscoveryResult(DiscoveryResult.Status.ERROR);
     }

java/com/google/gerrit/sshd/SshUtil.java

diff --git a/java/com/google/gerrit/sshd/SshUtil.java b/java/com/google/gerrit/sshd/SshUtil.java
index b37ca8b..ce35422 100644
--- a/java/com/google/gerrit/sshd/SshUtil.java
+++ b/java/com/google/gerrit/sshd/SshUtil.java
@@ -108,9 +108,7 @@
       strBuf.append(' ');
       strBuf.append("converted-key");
       return strBuf.toString();
-    } catch (IOException e) {
-      return keyStr;
-    } catch (RuntimeException re) {
+    } catch (IOException | RuntimeException e) {
       return keyStr;
     }
   }