From 9502a8773cabb528540e8f4d20bc87477a5a692c Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Mon, 27 Sep 2021 18:08:54 +0300
Subject: [PATCH] CB-1266 Datasource node path resolve fix

---
 .../src/io/cloudbeaver/model/WebConnectionInfo.java       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
index 5fac0f914c..3eef9a23ac 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebConnectionInfo.java
@@ -28,7 +28,7 @@ import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.impl.auth.AuthModelDatabaseNative;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
-import org.jkiss.dbeaver.model.navigator.DBNDatabaseNode;
+import org.jkiss.dbeaver.model.navigator.DBNDataSource;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.utils.CommonUtils;
@@ -160,11 +160,7 @@ public class WebConnectionInfo {
 
     @Property
     public String getNodePath() {
-        DBNDatabaseNode dsNode = session.getNavigatorModel().getNodeByObject(
-            session.getProgressMonitor(),
-            dataSourceContainer,
-            true);
-        return dsNode == null ? null : dsNode.getNodeItemPath();
+        return DBNDataSource.makeDataSourceItemPath(dataSourceContainer);
     }
 
     @Property