From 70fee700b8e58bfaf8ed7c171bf7da7629ed84ab Mon Sep 17 00:00:00 2001 From: serge-rider Date: Sun, 4 Oct 2020 23:23:51 +0300 Subject: [PATCH] CB-361 session refresh fix --- .../src/io/cloudbeaver/model/session/WebSession.java | 2 +- .../src/io/cloudbeaver/service/core/impl/WebServiceCore.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java index 95b3f5cf62..f68f6eeeee 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java @@ -249,7 +249,7 @@ public class WebSession implements DBASession { // Add all provided datasources to the session List connList = new ArrayList<>(); DBPDataSourceRegistry registry = sessionProject.getDataSourceRegistry(); - registry.refreshConfig(); + //registry.refreshConfig(); for (DBPDataSourceContainer ds : registry.getDataSources()) { if (ds.isProvided()) { diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java index 52e6bd81ab..eb4690458e 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java @@ -248,7 +248,6 @@ public class WebServiceCore implements DBWServiceCore { if (CommonUtils.isEmpty(newDataSource.getName())) { newDataSource.setName(CommonUtils.notNull(connectionConfig.getName(), "NewConnection")); } - ((DataSourceDescriptor)newDataSource).setTemporary(true); sessionRegistry.addDataSource(newDataSource); WebConnectionInfo connectionInfo = new WebConnectionInfo(webSession, newDataSource); @@ -267,7 +266,6 @@ public class WebServiceCore implements DBWServiceCore { DBPDataSourceRegistry sessionRegistry = webSession.getSingletonProject().getDataSourceRegistry(); DBPDataSourceContainer newDataSource = sessionRegistry.createDataSource(dataSourceTemplate); - ((DataSourceDescriptor)newDataSource).setTemporary(true); DBPConnectionConfiguration cfg = newDataSource.getConnectionConfiguration(); ((DataSourceDescriptor) newDataSource).setNavigatorSettings(CBApplication.getInstance().getDefaultNavigatorSettings());