fix:DruidDatasource无法关闭closed (#637) (#638)

shen3 · web-flow · commit f01808202ad7 · 2024-05-15T16:25:02.000+08:00
* fix:DruidDatasource无法关闭closed (#637) * fix:DruidDatasource无法关闭closed (#637) --------- Co-authored-by: shencj10 <MX123567@>
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
@@ -290,6 +290,10 @@ private void closeDataSource(String ds, DataSource dataSource, boolean graceDest
                     }
                 }
             }
+
+            if (null == realDataSource) {
+                realDataSource = dataSource;
+            }
             if (null != realDataSource) {
                 DataSourceDestroyer destroyer = new DefaultDataSourceDestroyer();
                 if (graceDestroy) {

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,10 @@ private void closeDataSource(String ds, DataSource dataSource, boolean graceDest`
`290`	`290`	`}`
`291`	`291`	`}`
`292`	`292`	`}`
	`293`	`+`
	`294`	`+ if (null == realDataSource) {`
	`295`	`+ realDataSource = dataSource;`
	`296`	`+ }`
`293`	`297`	`if (null != realDataSource) {`
`294`	`298`	`DataSourceDestroyer destroyer = new DefaultDataSourceDestroyer();`
`295`	`299`	`if (graceDestroy) {`