PHOENIX-4399 Remove explicit abort on RegionServerServices (addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cb962f94 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cb962f94 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cb962f94 Branch: refs/heads/master Commit: cb962f946c64d89f84824e10a500258ae293ef45 Parents: b78f45c Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Fri Jun 22 16:00:54 2018 -0700 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Fri Jun 22 16:00:54 2018 -0700 ---------------------------------------------------------------------- .../apache/phoenix/hbase/index/util/IndexManagementUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cb962f94/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java index 6c7966f..bcde1a0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/IndexManagementUtil.java @@ -197,11 +197,11 @@ public class IndexManagementUtil { public static void rethrowIndexingException(Throwable e) throws IOException { try { throw e; - } catch (IOException e1) { + } catch (IOException | FatalIndexBuildingFailureException e1) { LOG.info("Rethrowing " + e); throw e1; - } catch (Throwable e1) { - if (e1 instanceof FatalIndexBuildingFailureException) { throw (FatalIndexBuildingFailureException)e1; } + } + catch (Throwable e1) { LOG.info("Rethrowing " + e1 + " as a " + IndexBuildingFailureException.class.getSimpleName()); throw new IndexBuildingFailureException("Failed to build index for unexpected reason!", e1); }
