From 61157c53c83c1374fa47b25b0cb216726ebca114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Wed, 7 Oct 2020 01:19:11 +0800 Subject: [PATCH] ignore Closed Connection error, fix #3836 --- .../java/com/alibaba/druid/util/JdbcUtils.java | 12 +++++++++++- .../alibaba/druid/bvt/utils/JdbcUtilsTest.java | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 1c85a6d1ff..7e990eee72 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -105,7 +105,17 @@ public final class JdbcUtils implements JdbcConstants { try { x.close(); } catch (Exception e) { - LOG.debug("close statement error", e); + boolean printError = true; + + if (e instanceof java.sql.SQLRecoverableException + && "Closed Connection".equals(e.getMessage()) + ) { + printError = false; + } + + if (printError) { + LOG.debug("close statement error", e); + } } } diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java index 1ed59f52e1..ece386bc4e 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java @@ -15,10 +15,14 @@ */ package com.alibaba.druid.bvt.utils; +import java.sql.SQLException; +import java.sql.SQLRecoverableException; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockStatement; import org.junit.Assert; import junit.framework.TestCase; @@ -78,5 +82,14 @@ public class JdbcUtilsTest extends TestCase { List> list = JdbcUtils.executeQuery(dataSource, "select * from user"); Assert.assertEquals(0, list.size()); } - } + } + + public void test_close() throws Exception { + MockStatement stmt = new MockStatement(new MockConnection()) { + public void close() throws SQLException { + throw new SQLRecoverableException("Closed Connection"); + } + }; + JdbcUtils.close(stmt); + } }