From 058467d19c18eb7a6c7c3c431d63d156223914f5 Mon Sep 17 00:00:00 2001 From: Huang YunKun Date: Wed, 22 Jul 2020 13:26:00 +0800 Subject: [PATCH 1/2] fix CreateConnectionThread not exit issue --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 30e1148fe4..3dd686ebc7 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2808,6 +2808,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat setFailContinuous(true); break; } + + if (Thread.interrupted()) { + break; + } if (connection == null) { continue; From d5a0ad26b502a43ce5d1c0ebf5b8d25c4790eb1f Mon Sep 17 00:00:00 2001 From: Huang YunKun Date: Wed, 22 Jul 2020 19:07:05 +0800 Subject: [PATCH 2/2] Update DruidDataSource.java --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 +- 1 file changed, 1 insertion(+), 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 3dd686ebc7..77858f9833 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2809,7 +2809,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat break; } - if (Thread.interrupted()) { + if (closing || closed) { break; }