From 4d2ad4246669f8ac2a8e5652630868e9a2db07dc Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Mon, 26 Oct 2020 21:14:25 +0300
Subject: [PATCH] CB-442 DocumentDB: driver config in EE + exclude from RDS
 databases

---
 .../src/io/cloudbeaver/model/session/WebSession.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 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 58793835f6..546491f3f3 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
@@ -425,12 +425,17 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
 
     @NotNull
     public WebConnectionInfo getWebConnectionInfo(String connectionID) throws DBWebException {
+        return getWebConnectionInfo(sessionProject.getDataSourceRegistry(), connectionID);
+    }
+
+    @NotNull
+    public WebConnectionInfo getWebConnectionInfo(DBPDataSourceRegistry registry, String connectionID) throws DBWebException {
         WebConnectionInfo connectionInfo;
         synchronized (connections) {
             connectionInfo = connections.get(connectionID);
         }
         if (connectionInfo == null) {
-            DBPDataSourceContainer dataSource = sessionProject.getDataSourceRegistry().getDataSource(connectionID);
+            DBPDataSourceContainer dataSource = registry.getDataSource(connectionID);
             if (dataSource != null) {
                 connectionInfo = new WebConnectionInfo(this, dataSource);
                 synchronized (connections) {
@@ -443,7 +448,6 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
         return connectionInfo;
     }
 
-
     public void addConnection(WebConnectionInfo connectionInfo) {
         synchronized (connections) {
             connections.put(connectionInfo.getId(), connectionInfo);
@@ -611,7 +615,7 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
     @Override
     public boolean provideAuthParameters(DBPDataSourceContainer dataSourceContainer, DBPConnectionConfiguration configuration) {
         try {
-            WebConnectionInfo webConnectionInfo = getWebConnectionInfo(dataSourceContainer.getId());
+            WebConnectionInfo webConnectionInfo = getWebConnectionInfo(dataSourceContainer.getRegistry(), dataSourceContainer.getId());
 
             // Properties from nested auth sessions
             DBAAuthCredentialsProvider nestedProvider = getAdapter(DBAAuthCredentialsProvider.class);