From 36722bc051dd9e0b1915a4a0479746f36d42d820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Tue, 19 Apr 2016 11:44:12 +0800 Subject: [PATCH 1/2] bug fixed for load filter error --- src/main/java/com/alibaba/druid/filter/FilterManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/filter/FilterManager.java b/src/main/java/com/alibaba/druid/filter/FilterManager.java index b201de2b0b..547519e9b8 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterManager.java +++ b/src/main/java/com/alibaba/druid/filter/FilterManager.java @@ -46,7 +46,7 @@ public class FilterManager { aliasMap.put(name, (String) entry.getValue()); } } - } catch (Exception e) { + } catch (Throwable e) { LOG.error("load filter config error", e); } } From e0357052195bcd03dccb74991a86391ad1239948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Wed, 20 Apr 2016 15:05:17 +0800 Subject: [PATCH 2/2] discard mysql streaming resultSet close error connection --- .../druid/pool/vendor/MySqlExceptionSorter.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java index 9fa8827c11..076bac37da 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java @@ -77,6 +77,17 @@ public class MySqlExceptionSorter implements ExceptionSorter { return true; } } + + StackTraceElement[] stackTrace = e.getStackTrace(); + for (int i = 0; i < stackTrace.length; ++i) { + StackTraceElement element = stackTrace[i]; + if ("com.mysql.jdbc.RowDataDynamic".equals(element.getClassName()) // + && "close".equals(element.getMethodName()) + ) { + return true; + } + } + return false; }