From 700d8c904ce98f24ce11fb01c985a121e0d212e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B0=E5=BD=A6=E7=B3=96?=
 <44092516+BingChunMoLi@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:41:37 +0800
Subject: [PATCH] =?UTF-8?q?perf(close-datasource):=20=E5=9C=A8=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=8D=AE=E5=BA=93map=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4datasource=20(#618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

baomidou/dynamic-datasource#614
---
 .../baomidou/dynamic/datasource/DynamicRoutingDataSource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java
index e4b6c7d..d1b877d 100644
--- a/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java
+++ b/dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/DynamicRoutingDataSource.java
@@ -194,7 +194,6 @@ public class DynamicRoutingDataSource extends AbstractRoutingDataSource implemen
         }
         if (dataSourceMap.containsKey(ds)) {
             DataSource dataSource = dataSourceMap.remove(ds);
-            closeDataSource(ds, dataSource, graceDestroy);
             if (ds.contains(UNDERLINE)) {
                 String group = ds.split(UNDERLINE)[0];
                 if (groupDataSources.containsKey(group)) {
@@ -204,6 +203,7 @@ public class DynamicRoutingDataSource extends AbstractRoutingDataSource implemen
                     }
                 }
             }
+            closeDataSource(ds, dataSource, graceDestroy);
             log.info("dynamic-datasource - remove the database named [{}] success", ds);
         } else {
             log.warn("dynamic-datasource - could not find a database named [{}]", ds);