From 62014b0f950169c243b4e862d80de54c1e06ae43 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Tue, 19 May 2020 21:33:55 +0300 Subject: [PATCH] Provided credentials read fix --- .../service/navigator/impl/WebServiceNavigator.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java index ef24a556df..a0119551f6 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/impl/WebServiceNavigator.java @@ -54,7 +54,8 @@ public class WebServiceNavigator implements DBWServiceNavigator { DBRProgressMonitor monitor = session.getProgressMonitor(); DBNNode[] nodeChildren; - if (CommonUtils.isEmpty(parentPath) || "/".equals(parentPath)) { + boolean isRootPath = CommonUtils.isEmpty(parentPath) || "/".equals(parentPath); + if (isRootPath) { nodeChildren = session.getDatabases().getChildren(monitor); } else { DBNNode parentNode = session.getNavigatorModel().getNodeByPath(monitor, parentPath); @@ -70,9 +71,11 @@ public class WebServiceNavigator implements DBWServiceNavigator { return EMPTY_NODE_LIST; } List result = new ArrayList<>(); - // Add navigator extensions - for (DBNNode extraNode : session.getNavigatorModel().getRoot().getExtraNodes()) { - result.add(new WebNavigatorNodeInfo(session, extraNode)); + if (isRootPath) { + // Add navigator extensions + for (DBNNode extraNode : session.getNavigatorModel().getRoot().getExtraNodes()) { + result.add(new WebNavigatorNodeInfo(session, extraNode)); + } } for (DBNNode node : nodeChildren) {