From 664864d4787ab147bb7a70205bf3291d003cf959 Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Thu, 27 Jul 2023 17:46:44 +0400
Subject: [PATCH] CB-3640 gitignore settings (#1830)

* CB-3640 gitignore settings

* CB-3640 ignore backup files

---------

Co-authored-by: mr-anton-t <42037741+mr-anton-t@users.noreply.github.com>
Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
---
 .../model/rm/local/LocalResourceController.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
index 53cc29fa36..a28483fc79 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -74,7 +74,7 @@ public class LocalResourceController implements RMController {
     public static final String DEFAULT_CHANGE_ID = "0";
 
     private final DBPWorkspace workspace;
-    private final SMCredentialsProvider credentialsProvider;
+    protected final SMCredentialsProvider credentialsProvider;
 
     private final Path rootPath;
     private final Path userProjectsPath;
@@ -355,12 +355,12 @@ public class LocalResourceController implements RMController {
     @Override
     public String getProjectsDataSources(@NotNull String projectId, @Nullable String[] dataSourceIds) throws DBException {
         DBPProject projectMetadata = getWebProject(projectId, false);
-        DBPDataSourceRegistry registry = projectMetadata.getDataSourceRegistry();
-        registry.checkForErrors();
         return doFileReadOperation(
             projectId,
             projectMetadata.getMetadataFolder(false),
             () -> {
+                DBPDataSourceRegistry registry = projectMetadata.getDataSourceRegistry();
+                registry.checkForErrors();
                 DataSourceConfigurationManagerBuffer buffer = new DataSourceConfigurationManagerBuffer();
                 Predicate<DBPDataSourceContainer> filter = null;
                 if (!ArrayUtils.isEmpty(dataSourceIds)) {
@@ -922,21 +922,21 @@ public class LocalResourceController implements RMController {
         }
     }
 
-    private <T> T doProjectOperation(String projectId, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doProjectOperation(String projectId, RMFileOperation<T> operation) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             fileHandler.projectOpened(projectId);
         }
         return operation.doOperation();
     }
 
-    private <T> T doFileReadOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doFileReadOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             fileHandler.beforeFileRead(projectId, file);
         }
         return operation.doOperation();
     }
 
-    private <T> T doFileWriteOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
+    protected <T> T doFileWriteOperation(String projectId, Path file, RMFileOperation<T> operation) throws DBException {
         for (RMFileOperationHandler fileHandler : fileHandlers) {
             fileHandler.beforeFileChange(projectId, file);
         }