CB-5238 fix creating connection with url

dbeaver · Jun 27, 2024 · eee54dc · eee54dc
1 parent de1ad0e
commit eee54dc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -206,6 +206,10 @@ public static void setConnectionConfiguration(DBPDriver driver, DBPConnectionCon
     }
 
     private static void setMainProperties(DBPConnectionConfiguration dsConfig, WebConnectionConfig config) {
+        if (CommonUtils.isNotEmpty(config.getUrl())) {
+            dsConfig.setUrl(config.getUrl());
+            return;
+        }
         if (config.getMainProperties() != null) {
             for (Map.Entry<String, Object> e : config.getMainProperties().entrySet()) {
                 switch (e.getKey()) {
@@ -218,10 +222,6 @@ private static void setMainProperties(DBPConnectionConfiguration dsConfig, WebCo
             }
             return;
         }
-        if (CommonUtils.isNotEmpty(config.getUrl())) {
-            dsConfig.setUrl(config.getUrl());
-            return;
-        }
         if (config.getHost() != null) {
             dsConfig.setHostName(config.getHost());
         }