From 95e36c990c1adb61f36cdf71d6a8f521d31ae3f7 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Sat, 19 Aug 2017 21:24:24 +0800
Subject: [PATCH] fixed merged code error.

---
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 27489aa5a2..575ef3a288 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -843,7 +843,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             throw e;
         } catch (InterruptedException e) {
             throw new SQLException(e.getMessage(), e);
-        } catch (Throwable e){
+        } catch (RuntimeException e){
+            LOG.error("{dataSource-" + this.getID() + "} init error", e);
+            throw e;
+        } catch (Error e){
             LOG.error("{dataSource-" + this.getID() + "} init error", e);
             throw e;
         }