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-442 DocumentDB: driver config in EE + exclude from RDS databases

Browse Source
This commit is contained in:
Serge Rider
2020-10-26 21:14:25 +03:00
parent 2189289fb7
commit 4d2ad42466
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
+7 -3
View File
@@ -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);