opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-156 Detached datasources.

Browse Source
This commit is contained in:
Serge Rider
2020-06-12 17:22:14 +03:00
parent 40270939f3
commit 0e9ba28756
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+4 -3
View File
@@ -206,9 +206,10 @@ public class WebServiceCore implements DBWServiceCore {
WebConnectionInfo connectionInfo = webSession.getWebConnectionInfo(connectionId);
boolean disconnected = false;
DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
if (connectionInfo.isConnected()) {
try {
connectionInfo.getDataSourceContainer().disconnect(webSession.getProgressMonitor());
dataSourceContainer.disconnect(webSession.getProgressMonitor());
disconnected = true;
} catch (DBException e) {
log.error("Error closing connection", e);
@@ -216,8 +217,8 @@ public class WebServiceCore implements DBWServiceCore {
// Disconnect in async mode?
//new DisconnectJob(connectionInfo.getDataSource()).schedule();
}
if (connectionInfo.getDataSourceContainer().isTemporary()) {
webSession.getDatabasesNode().getDataSourceRegistry().removeDataSource(connectionInfo.getDataSourceContainer());
if (dataSourceContainer.isTemporary()) {
webSession.getDatabasesNode().getDataSourceRegistry().removeDataSource(dataSourceContainer);
webSession.removeConnection(connectionInfo);
}