diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java index 576ddce91a..cf601dae8c 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java @@ -93,8 +93,8 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode { } @Override - public DBNResourceManagerResource[] getChildren(DBRProgressMonitor monitor) throws DBException { - if (children == null) { + public DBNResourceManagerResource[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException { + if (children == null && !monitor.isForceCacheUsage()) { List rfList = new ArrayList<>(); for (RMResource resource : getResourceController().listResources( project.getId(), null, null, true, false, false)) { diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java index 824418f6c4..30919d34ca 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java @@ -110,8 +110,8 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode { } @Override - public DBNNode[] getChildren(DBRProgressMonitor monitor) throws DBException { - if (children == null) { + public DBNNode[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException { + if (children == null && !monitor.isForceCacheUsage()) { List rfList = new ArrayList<>(); for (RMResource resource : getResourceController().listResources( getResourceProject().getId(), getResourceFolder(), null, true, false, false)) { diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java index 1bdd01bfd3..d03d823cdb 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerRoot.java @@ -19,6 +19,7 @@ package io.cloudbeaver.model.rm; import io.cloudbeaver.model.session.WebSession; import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.model.DBPHiddenObject; @@ -81,8 +82,8 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject, } @Override - public DBNResourceManagerProject[] getChildren(DBRProgressMonitor monitor) throws DBException { - if (projects == null) { + public DBNResourceManagerProject[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException { + if (projects == null && !monitor.isForceCacheUsage()) { List projectList = getParentNode().getModel().getModelProjects(); if (CommonUtils.isEmpty(projectList)) { return new DBNResourceManagerProject[0];