From d14ec71323e04adcec3c7418db3439cd33971a2e Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Wed, 3 Aug 2016 19:37:58 -0700
Subject: [PATCH] HBASE-16350 Undo server abort from HBASE-14968

---
 .../java/org/apache/hadoop/hbase/executor/EventHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
index 73fd7f28908..a418e119f09 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
@@ -226,7 +226,7 @@ public abstract class EventHandler implements Runnable, Comparable<Runnable> {
   protected void handleException(Throwable t) {
     String msg = "Caught throwable while processing event " + eventType;
     LOG.error(msg, t);
-    if (server != null) {
+    if (server != null && (t instanceof Error || t instanceof RuntimeException)) {
       server.abort(msg, t);
     }
   }