Merge branch 'devel' into CB-4335-implement-required-flag-to-all-forms-in-the-app

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java

@@ -557,7 +557,12 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
             } else if (serverURL == null) {
                 String hostName = serverHost;
                 if (CommonUtils.isEmpty(hostName)) {
-                    hostName = InetAddress.getLocalHost().getHostName();
+                    try {
+                        hostName = InetAddress.getLocalHost().getHostName();
+                    } catch (UnknownHostException e) {
+                        log.debug("Error resolving localhost address: " + e.getMessage());
+                        hostName = "localhost";
+                    }
                 }
                 serverURL = "http://" + hostName + ":" + serverPort;
             }
@@ -604,7 +609,7 @@ public abstract class CBApplication extends BaseWebApplication implements WebAut
                 }
             }
             parseAdditionalConfiguration(configProps);
-        } catch (IOException | DBException e) {
+        } catch (DBException e) {
             throw new DBException("Error parsing server configuration", e);
         }
 

server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java

@@ -57,6 +57,7 @@ import org.jkiss.utils.SecurityUtils;
 
 import java.io.*;
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.sql.*;
 import java.util.*;
@@ -458,8 +459,12 @@ public class CBDatabase {
     }
 
     private void checkInstanceRecord(Connection connection) throws SQLException, IOException {
-        InetAddress localHost = InetAddress.getLocalHost();
-        String hostName = localHost.getHostName();
+        String hostName;
+        try {
+            hostName = InetAddress.getLocalHost().getHostName();
+        } catch (UnknownHostException e) {
+            hostName = "localhost";
+        }
         byte[] hardwareAddress = RuntimeUtils.getLocalMacAddress();
         String macAddress = CommonUtils.toHexString(hardwareAddress);
 

webapp/packages/core-localization/src/locales/en.ts

@@ -107,6 +107,7 @@ export default [
   ['ui_upload_file_fail', 'Failed to upload file'],
   ['ui_filter', 'Filter'],
   ['ui_disable', 'Disable'],
+  ['ui_test', 'Test'],
 
   ['root_permission_denied', "You don't have permissions"],
   ['root_permission_no_permission', "You don't have permission for this action"],

webapp/packages/core-localization/src/locales/it.ts

@@ -91,6 +91,7 @@ export default [
   ['ui_upload_file_fail', 'Failed to upload file'],
   ['ui_filter', 'Filter'],
   ['ui_disable', 'Disable'],
+  ['ui_test', 'Test'],
 
   ['root_permission_denied', 'Non hai i permessi'],
   ['app_root_session_expire_warning_title', 'La sessione sta per scadere'],

webapp/packages/core-localization/src/locales/ru.ts

@@ -103,6 +103,7 @@ export default [
   ['ui_upload_file_fail', 'Не удалось загрузить файл'],
   ['ui_filter', 'Фильтр'],
   ['ui_disable', 'Отключить'],
+  ['ui_test', 'Проверить'],
 
   ['root_permission_denied', 'Отказано в доступе'],
   ['root_permission_no_permission', 'У вас нет разрешения на это действие'],

webapp/packages/core-localization/src/locales/zh.ts

@@ -104,6 +104,7 @@ export default [
   ['ui_upload_file_fail', 'Failed to upload file'],
   ['ui_filter', 'Filter'],
   ['ui_disable', 'Disable'],
+  ['ui_test', 'Test'],
 
   ['root_permission_denied', '您没有权限'],
   ['root_permission_no_permission', '您没有权限执行此操作'],