From eee54dcc738461db13731ec4ded2e72e51993932 Mon Sep 17 00:00:00 2001
From: Ainur <ainur.iagudin@dbeaver.com>
Date: Thu, 27 Jun 2024 16:51:14 +0200
Subject: [PATCH] CB-5238 fix creating connection with url

---
 .../src/io/cloudbeaver/WebServiceUtils.java               | 8 ++++----
 1 file changed, 4 insertions(+), 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
index add1a32710..e63ed012c9 100644
--- 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());
         }