ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix close

Browse Source
This commit is contained in:
Looly 2021-08-16 22:48:59 +08:00
parent 3fe722554c
commit 6e871a1fae
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@
### 🐞Bug修复
* 【extra 】 修复TinyPinyinEngine空构造造成可能的误判问题
* 【http 】 修复在gzip模式下Content-Length服务端设置异常导致的阶段
* 【db 】 修复PooledDataSource关闭逻辑错误问题
-------------------------------------------------------------------------------------------------------------

28
hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
View File

@ -14,7 +14,7 @@ import java.util.Queue;
/**
* 池化数据源
*
*
* @author Looly
*
*/
@ -27,7 +27,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 获得一个数据源
*
*
* @param group 数据源分组
* @return {@link PooledDataSource}
*/
@ -37,7 +37,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 获得一个数据源，使用空分组
*
*
* @return {@link PooledDataSource}
*/
synchronized public static PooledDataSource getDataSource() {
@ -54,7 +54,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 构造，读取默认的配置文件
*
*
* @param group 分组
*/
public PooledDataSource(String group) {
@ -63,7 +63,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 构造
*
*
* @param setting 数据库配置文件对象
* @param group 分组
*/
@ -73,7 +73,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 构造
*
*
* @param config 数据库配置
*/
public PooledDataSource(DbConfig config) {
@ -105,7 +105,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 释放连接，连接会被返回给连接池
*
*
* @param conn 连接
* @return 释放成功与否
*/
@ -116,7 +116,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 创建新连接
*
*
* @return 新连接
* @throws SQLException SQL异常
*/
@ -130,7 +130,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 获取连接对象
*
*
* @param wait 当池中无连接等待的毫秒数
* @return 连接对象
* @throws SQLException SQL异常
@ -147,11 +147,9 @@ public class PooledDataSource extends AbstractDataSource {
@Override
synchronized public void close() {
if (CollectionUtil.isNotEmpty(this.freePool)) {
for (PooledConnection pooledConnection : freePool) {
pooledConnection.release();
this.freePool.clear();
this.freePool = null;
}
this.freePool.forEach(PooledConnection::release);
this.freePool.clear();
this.freePool = null;
}
}
@ -162,7 +160,7 @@ public class PooledDataSource extends AbstractDataSource {
/**
* 直接从连接池中获取连接，如果池中无连接直接抛出异常
*
*
* @return PooledConnection
* @throws SQLException SQL异常
*/