From e2dee49dc6be02ccbc5a42ddc122de61078ec7f5 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Fri, 16 Sep 2022 09:13:11 +0200
Subject: [PATCH] Driver file resolution fix

---
 .../src/io/cloudbeaver/server/CBPlatform.java        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 8aabe975f3..f2000e8d37 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
@@ -293,16 +293,20 @@ public class CBPlatform extends BasePlatformImpl {
                     if (!WebDriverRegistry.getInstance().isDriverEnabled(driver)) {
                         continue;
                     }
-                    boolean hasAllFiles = true;
+                    boolean hasAllFiles = true, hasJars = false;
                     for (DBPDriverLibrary lib : libraries) {
                         if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&
-                            (lib.getLocalFile() == null || !Files.exists(lib.getLocalFile()))) {
+                            (lib.getLocalFile() == null || !Files.exists(lib.getLocalFile())))
+                        {
                             hasAllFiles = false;
                             log.error("\tDriver '" + driver.getId() + "' is missing library '" + lib.getDisplayName() + "'");
-                            break;
+                        } else {
+                            if (lib.getType() == DBPDriverLibrary.FileType.jar) {
+                                hasJars = true;
+                            }
                         }
                     }
-                    if (hasAllFiles) {
+                    if (hasAllFiles || hasJars) {
                         applicableDrivers.add(driver);
                     }
                 }