Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
9a0081ba
提交
9a0081ba
authored
10月 10, 2008
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
The auto-reconnect feature didn't work when using the auto-server mode. Fixed.
上级
1173ab9b
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
26 行增加
和
7 行删除
+26
-7
SessionRemote.java
h2/src/main/org/h2/engine/SessionRemote.java
+7
-4
TestAutoReconnect.java
h2/src/test/org/h2/test/server/TestAutoReconnect.java
+19
-3
没有找到文件。
h2/src/main/org/h2/engine/SessionRemote.java
浏览文件 @
9a0081ba
...
@@ -224,10 +224,10 @@ public class SessionRemote implements SessionInterface, DataHandler {
...
@@ -224,10 +224,10 @@ public class SessionRemote implements SessionInterface, DataHandler {
}
}
public
SessionInterface
createSession
(
ConnectionInfo
ci
)
throws
SQLException
{
public
SessionInterface
createSession
(
ConnectionInfo
ci
)
throws
SQLException
{
return
new
SessionRemote
(
ci
).
connectEmbeddedOrServer
();
return
new
SessionRemote
(
ci
).
connectEmbeddedOrServer
(
false
);
}
}
private
SessionInterface
connectEmbeddedOrServer
()
throws
SQLException
{
private
SessionInterface
connectEmbeddedOrServer
(
boolean
openNew
)
throws
SQLException
{
ConnectionInfo
ci
=
connectionInfo
;
ConnectionInfo
ci
=
connectionInfo
;
if
(
ci
.
isRemote
())
{
if
(
ci
.
isRemote
())
{
connectServer
(
ci
);
connectServer
(
ci
);
...
@@ -243,6 +243,9 @@ public class SessionRemote implements SessionInterface, DataHandler {
...
@@ -243,6 +243,9 @@ public class SessionRemote implements SessionInterface, DataHandler {
connectionInfo
=
(
ConnectionInfo
)
ci
.
clone
();
connectionInfo
=
(
ConnectionInfo
)
ci
.
clone
();
}
}
SessionInterface
si
=
(
SessionInterface
)
ClassUtils
.
loadSystemClass
(
"org.h2.engine.Session"
).
newInstance
();
SessionInterface
si
=
(
SessionInterface
)
ClassUtils
.
loadSystemClass
(
"org.h2.engine.Session"
).
newInstance
();
if
(
openNew
)
{
ci
.
setProperty
(
"OPEN_NEW"
,
"true"
);
}
return
si
.
createSession
(
ci
);
return
si
.
createSession
(
ci
);
}
catch
(
SQLException
e
)
{
}
catch
(
SQLException
e
)
{
int
errorCode
=
e
.
getErrorCode
();
int
errorCode
=
e
.
getErrorCode
();
...
@@ -434,7 +437,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
...
@@ -434,7 +437,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
return
false
;
return
false
;
}
}
lastReconnect
++;
lastReconnect
++;
embedded
=
connectEmbeddedOrServer
();
embedded
=
connectEmbeddedOrServer
(
false
);
if
(
embedded
==
this
)
{
if
(
embedded
==
this
)
{
// connected to a server somewhere else
// connected to a server somewhere else
embedded
=
null
;
embedded
=
null
;
...
@@ -442,7 +445,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
...
@@ -442,7 +445,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
// opened an embedded connection now -
// opened an embedded connection now -
// must connect to this database in server mode
// must connect to this database in server mode
// unfortunately
// unfortunately
connectEmbeddedOrServer
();
connectEmbeddedOrServer
(
true
);
}
}
if
(
sessionState
!=
null
&&
sessionState
.
size
()
>
0
)
{
if
(
sessionState
!=
null
&&
sessionState
.
size
()
>
0
)
{
sessionStateUpdating
=
true
;
sessionStateUpdating
=
true
;
...
...
h2/src/test/org/h2/test/server/TestAutoReconnect.java
浏览文件 @
9a0081ba
...
@@ -54,11 +54,27 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
...
@@ -54,11 +54,27 @@ public class TestAutoReconnect extends TestBase implements DatabaseEventListener
}
}
public
void
test
()
throws
Exception
{
public
void
test
()
throws
Exception
{
test
(
true
);
testIsClosed
();
test
(
false
);
testReconnect
(
true
);
testReconnect
(
false
);
}
}
private
void
test
(
boolean
autoServer
)
throws
Exception
{
private
void
testIsClosed
()
throws
Exception
{
deleteDb
(
"autoReconnect"
);
url
=
"jdbc:h2:"
+
baseDir
+
"/autoReconnect;"
+
"AUTO_SERVER=TRUE;OPEN_NEW=TRUE"
;
Connection
conn1
=
DriverManager
.
getConnection
(
url
);
conn1
.
createStatement
().
execute
(
"CREATE TABLE TEST(ID INT)"
);
Connection
conn2
=
DriverManager
.
getConnection
(
url
);
assertFalse
(
conn1
.
isClosed
());
conn1
.
close
();
assertTrue
(
conn1
.
isClosed
());
assertFalse
(
conn2
.
isClosed
());
conn2
.
close
();
assertTrue
(
conn1
.
isClosed
());
}
private
void
testReconnect
(
boolean
autoServer
)
throws
Exception
{
this
.
autoServer
=
autoServer
;
this
.
autoServer
=
autoServer
;
deleteDb
(
"autoReconnect"
);
deleteDb
(
"autoReconnect"
);
if
(
autoServer
)
{
if
(
autoServer
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论