Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
60b2f82c
提交
60b2f82c
authored
14 年前
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
The built-in connection pool was simplified a bit.
上级
7d92266c
master
noel-pr1
plus33-master
pr/267
stumc-Issue#576
version-1.4.198
version-1.4.197
version-1.4.196
version-1.4.195
version-1.4.194
version-1.4.193
version-1.4.192
version-1.4.191
version-1.4.190
version-1.4.188
version-1.4.187
version-1.4.186
version-1.4.185
version-1.4.184
version-1.4.183
version-1.4.182
version-1.4.181
version-1.4.178
version-1.4.177
version-1.3
version-1.2
version-1.1
version-1.0
无相关合并请求
显示空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
15 行增加
和
56 行删除
+15
-56
JdbcConnectionPool.java
h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java
+15
-56
没有找到文件。
h2/src/main/org/h2/jdbcx/JdbcConnectionPool.java
浏览文件 @
60b2f82c
...
...
@@ -79,7 +79,7 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
this
.
dataSource
=
dataSource
;
try
{
logWriter
=
dataSource
.
getLogWriter
();
}
catch
(
Exception
e
)
{
}
catch
(
SQL
Exception
e
)
{
// ignore
}
}
...
...
@@ -159,25 +159,15 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
/**
* Closes all unused pooled connections.
* Exceptions while closing are written to the log stream (if set).
*/
public
synchronized
void
dispose
()
throws
SQLException
{
public
synchronized
void
dispose
()
{
if
(
isDisposed
)
{
return
;
}
isDisposed
=
true
;
SQLException
e
=
null
;
while
(!
recycledConnections
.
isEmpty
())
{
PooledConnection
pc
=
recycledConnections
.
pop
();
try
{
pc
.
close
();
}
catch
(
SQLException
e2
)
{
if
(
e
==
null
)
{
e
=
e2
;
}
}
}
if
(
e
!=
null
)
{
throw
e
;
closeConnection
(
recycledConnections
.
pop
());
}
}
...
...
@@ -211,6 +201,13 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
throw
new
SQLException
(
"Login timeout"
,
"08001"
,
8001
);
}
/**
* INTERNAL
*/
public
Connection
getConnection
(
String
user
,
String
password
)
{
throw
new
UnsupportedOperationException
();
}
private
Connection
getConnectionNow
()
throws
SQLException
{
if
(
isDisposed
)
{
throw
new
IllegalStateException
(
"Connection pool has been disposed."
);
...
...
@@ -235,15 +232,11 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
* @param pc the pooled connection
*/
synchronized
void
recycleConnection
(
PooledConnection
pc
)
{
if
(
isDisposed
)
{
disposeConnection
(
pc
);
return
;
}
if
(
activeConnections
<=
0
)
{
throw
new
AssertionError
();
}
activeConnections
--;
if
(
activeConnections
<
maxConnections
)
{
if
(
!
isDisposed
&&
activeConnections
<
maxConnections
)
{
recycledConnections
.
push
(
pc
);
}
else
{
closeConnection
(
pc
);
...
...
@@ -255,34 +248,9 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
try
{
pc
.
close
();
}
catch
(
SQLException
e
)
{
log
(
"Error while closing database connection: "
+
e
.
toString
());
}
}
/**
* Close the connection, and don't add it back to the pool.
*
* @param pc the pooled connection
*/
synchronized
void
disposeConnection
(
PooledConnection
pc
)
{
if
(
activeConnections
<=
0
)
{
throw
new
AssertionError
();
if
(
logWriter
!=
null
)
{
e
.
printStackTrace
(
logWriter
);
}
activeConnections
--;
notifyAll
();
closeConnection
(
pc
);
}
private
void
log
(
String
msg
)
{
String
s
=
getClass
().
getName
()
+
": "
+
msg
;
try
{
if
(
logWriter
==
null
)
{
System
.
err
.
println
(
s
);
}
else
{
logWriter
.
println
(
s
);
}
}
catch
(
Exception
e
)
{
// ignore
}
}
...
...
@@ -299,9 +267,7 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
* INTERNAL
*/
public
void
connectionErrorOccurred
(
ConnectionEvent
event
)
{
PooledConnection
pc
=
(
PooledConnection
)
event
.
getSource
();
pc
.
removeConnectionEventListener
(
this
);
disposeConnection
(
pc
);
// not used
}
/**
...
...
@@ -316,13 +282,6 @@ public class JdbcConnectionPool implements DataSource, ConnectionEventListener {
return
activeConnections
;
}
/**
* INTERNAL
*/
public
Connection
getConnection
(
String
username
,
String
password
)
{
throw
new
UnsupportedOperationException
();
}
/**
* INTERNAL
*/
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论