Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
bfdeeb9b
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bfdeeb9b
编写于
8月 12, 2015
作者:
J
jurgen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Connection test cancel implemented
上级
6fe4aff6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
17 deletion
+18
-17
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
...jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
+18
-17
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
浏览文件 @
bfdeeb9b
...
...
@@ -40,8 +40,8 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import
org.jkiss.dbeaver.registry.DataSourceDescriptor
;
import
org.jkiss.dbeaver.registry.DataSourceRegistry
;
import
org.jkiss.dbeaver.registry.DriverDescriptor
;
import
org.jkiss.dbeaver.runtime.AbstractJob
;
import
org.jkiss.dbeaver.runtime.DefaultProgressMonitor
;
import
org.jkiss.dbeaver.runtime.jobs.ConnectJob
;
import
org.jkiss.dbeaver.ui.UIUtils
;
import
org.jkiss.dbeaver.utils.GeneralUtils
;
import
org.jkiss.utils.CommonUtils
;
...
...
@@ -177,12 +177,11 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
return
false
;
}
private
class
ConnectionTester
extends
Abstra
ctJob
{
private
class
ConnectionTester
extends
Conne
ctJob
{
String
productName
;
String
productVersion
;
String
driverName
;
String
driverVersion
;
private
final
DataSourceDescriptor
testDataSource
;
private
boolean
initOnTest
;
long
startTime
=
-
1
;
long
connectTime
=
-
1
;
...
...
@@ -191,9 +190,8 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
public
ConnectionTester
(
DataSourceDescriptor
testDataSource
)
{
super
(
"Test connection to "
+
testDataSource
.
getName
()
);
super
(
testDataSource
);
setSystem
(
true
);
this
.
testDataSource
=
testDataSource
;
this
.
initOnTest
=
CommonUtils
.
toBoolean
(
testDataSource
.
getDriver
().
getDriverParameter
(
DBConstants
.
PARAM_INIT_ON_TEST
));
productName
=
null
;
productVersion
=
null
;
...
...
@@ -209,14 +207,17 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
Thread
.
currentThread
().
setName
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_thread
);
try
{
testDataSource
.
setName
(
testDataSource
.
getConnectionConfiguration
().
getUrl
());
container
.
setName
(
container
.
getConnectionConfiguration
().
getUrl
());
monitor
.
worked
(
1
);
startTime
=
System
.
currentTimeMillis
();
testDataSource
.
connect
(
monitor
,
initOnTest
,
false
);
super
.
run
(
monitor
);
connectTime
=
(
System
.
currentTimeMillis
()
-
startTime
);
if
(
monitor
.
isCanceled
())
{
return
Status
.
OK_STATUS
;
}
monitor
.
worked
(
1
);
DBPDataSource
dataSource
=
testDataSource
.
getDataSource
();
DBPDataSource
dataSource
=
container
.
getDataSource
();
if
(
dataSource
==
null
)
{
throw
new
DBException
(
CoreMessages
.
editors_sql_status_not_connected_to_database
);
}
...
...
@@ -247,19 +248,19 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
log
.
error
(
"Can't obtain connection metadata"
,
e
);
}
}
try
{
monitor
.
subTask
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_close
);
testDataSource
.
disconnect
(
monitor
,
false
);
}
catch
(
DBException
e
)
{
// ignore it
log
.
error
(
e
);
}
finally
{
monitor
.
done
();
}
}
finally
{
session
.
close
();
}
}
try
{
monitor
.
subTask
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_close
);
container
.
disconnect
(
monitor
,
false
);
}
catch
(
DBException
e
)
{
// ignore it
log
.
error
(
e
);
}
finally
{
monitor
.
done
();
}
monitor
.
subTask
(
CoreMessages
.
dialog_connection_wizard_start_connection_monitor_success
);
}
catch
(
DBException
ex
)
{
error
=
ex
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录