From 53ee0b54a72763197807027f42568cf03bad71ef Mon Sep 17 00:00:00 2001
From: Alexander Skoblikov <alexandr.skoblikov@jkiss.org>
Date: Tue, 22 Feb 2022 11:58:10 +0300
Subject: [PATCH] CB-1669 rollback web drivers filter

---
 .../src/io/cloudbeaver/registry/WebDriverRegistry.java     | 7 +------
 .../src/io/cloudbeaver/server/CBPlatform.java              | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebDriverRegistry.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebDriverRegistry.java
index 6a38c9e78d..10abc5617f 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebDriverRegistry.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebDriverRegistry.java
@@ -16,7 +16,6 @@
  */
 package io.cloudbeaver.registry;
 
-import io.cloudbeaver.server.ConfigurationUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
@@ -61,11 +60,7 @@ public class WebDriverRegistry {
     }
 
     public boolean isDriverEnabled(DBPDriver driver) {
-        String driverId = driver.getFullId();
-        if (webDrivers.contains(driverId)) {
-            return ConfigurationUtils.isDriverEnabled(driver);
-        }
-        return false;
+        return webDrivers.contains(driver.getFullId());
     }
 
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
index 2af8c29439..3dbeee0ccf 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
@@ -18,6 +18,7 @@
 package io.cloudbeaver.server;
 
 import io.cloudbeaver.model.session.WebSessionManager;
+import io.cloudbeaver.registry.WebDriverRegistry;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Platform;
 import org.jkiss.code.NotNull;
@@ -303,6 +304,9 @@ public class CBPlatform extends BasePlatformImpl {
             for (DBPDriver driver : dspd.getEnabledDrivers()) {
                 List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
                 {
+                    if (!WebDriverRegistry.getInstance().isDriverEnabled(driver)) {
+                        continue;
+                    }
                     boolean hasAllFiles = true;
                     for (DBPDriverLibrary lib : libraries) {
                         if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&