From b39a6bf13d8a2f06e64f137b54823945b928c2b1 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 20 May 2020 23:16:39 +0300
Subject: [PATCH] CB-59 Drivers in CB EE

---
 .../src/io/cloudbeaver/model/WebDatabaseDriverConfig.java     | 3 +++
 .../src/io/cloudbeaver/server/CBPlatform.java                 | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
index 7ca4561388..9782adfe43 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
@@ -152,6 +152,9 @@ public class WebDatabaseDriverConfig {
             cfg.setHostPort(driver.getDefaultPort());
             cfg.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, cfg));
             DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
+            if (properties == null) {
+                return new WebPropertyInfo[0];
+            }
 
             PropertySourceCustom propertySource = new PropertySourceCustom(
                 properties,
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 ac28c49583..020626f844 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
@@ -155,7 +155,7 @@ public class CBPlatform extends BasePlatformImpl {
                     continue;
                 }
                 List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
-                if (!libraries.isEmpty()) {
+                {
                     boolean hasAllFiles = true;
                     for (DBPDriverLibrary lib : libraries) {
                         if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&
@@ -172,7 +172,7 @@ public class CBPlatform extends BasePlatformImpl {
                 }
             }
         }
-        log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getId).collect(Collectors.joining(",")));
+        log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getFullName).collect(Collectors.joining(",")));
 
         sessionManager = WebSessionManager.getInstance();