[static analysis burndown] remove identical catch branch (#721)

bazelbuild · May 28, 2021 · 1c8e248 · 1c8e248
1 parent 43ac32e
commit 1c8e248
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.bazelci/static_analysis_checks.xml b/.bazelci/static_analysis_checks.xml
@@ -85,7 +85,6 @@
     <exclude name="ForLoopsMustUseBraces"/>
     <exclude name="FormalParameterNamingConventions"/>
     <exclude name="GenericsNaming"/>
-    <exclude name="IdenticalCatchBranches"/>
     <exclude name="IfElseStmtsMustUseBraces"/>
     <exclude name="IfStmtsMustUseBraces"/>
     <exclude name="LinguisticNaming"/>

diff --git a/src/main/java/build/buildfarm/common/redis/RedisClient.java b/src/main/java/build/buildfarm/common/redis/RedisClient.java
@@ -122,7 +122,8 @@ public <T> T call(JedisContext<T> withJedis) throws IOException {
         }
         throw e;
       }
-    } catch (JedisMisconfigurationException e) {
+    } catch (JedisMisconfigurationException | JedisNoReachableClusterNodeException e) {
+      // In regards to a Jedis misconfiguration,
       // the backplane is configured not to accept writes currently
       // as a result of an error. The error is meant to indicate
       // that substantial resources were unavailable.
@@ -131,8 +132,6 @@ public <T> T call(JedisContext<T> withJedis) throws IOException {
       // we are technically not at RESOURCE_EXHAUSTED, this is a
       // persistent state which can exist long past the error
       throw new IOException(Status.UNAVAILABLE.withCause(e).asRuntimeException());
-    } catch (JedisNoReachableClusterNodeException e) {
-      throw new IOException(Status.UNAVAILABLE.withCause(e).asRuntimeException());
     } catch (JedisConnectionException e) {
       if ((e.getMessage() != null && e.getMessage().equals("Unexpected end of stream."))
           || e.getCause() instanceof ConnectException) {