#29999 Use a different approach (remove extra node-loading call)

dbeaver · May 22, 2024 · 2419731 · 2419731
1 parent b731faf
commit 2419731
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNResource.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNResource.java
@@ -84,7 +84,7 @@ public class DBNResource extends DBNNode implements DBNNodeWithResource, DBNStre
 
  private IResource resource;
  private DBPResourceHandler handler;
- private volatile DBNNode[] children;
+ private DBNNode[] children;
  private DBPImage resourceImage;
 
  public DBNResource(DBNNode parentNode, IResource resource, DBPResourceHandler handler) {
@@ -216,11 +216,7 @@ public boolean allowsChildren() {
  @Override
  public DBNNode[] getChildren(DBRProgressMonitor monitor) throws DBException {
  if (children == null) {
- synchronized (this) {
- if (children == null) {
- this.children = readChildNodes(monitor);
- }
- }
+ this.children = readChildNodes(monitor);
  }
  return children;
  }

diff --git a/...iss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/DatabaseLazyEditorInput.java b/...iss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/DatabaseLazyEditorInput.java
@@ -252,9 +252,6 @@ public IDatabaseEditorInput initializeRealInput(@NotNull DBRProgressMonitor moni
  project = dataSourceContainer.getRegistry().getProject();
  }
  final DBNModel navigatorModel = DBWorkbench.getPlatform().getNavigatorModel();
- navigatorModel.ensureProjectLoaded(project);
- //dataSourceContainer, project, nodePath, nodeName, activePageId, activeFolderId
-
  long connectionTimeout = dataSourceContainer.getPreferenceStore().getInt(ModelPreferences.CONNECTION_VALIDATION_TIMEOUT);
  long connectionStart = System.currentTimeMillis();
  while (!dataSourceContainer.isConnected()) {