From 4aa4f0f3e520fee702966ad82023d93cf948870b Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Tue, 11 Jun 2024 19:27:46 +0300
Subject: [PATCH] fix_bug: lwm2m Bootstrap ShortServerId

---
 .../dao/service/validator/DeviceProfileDataValidator.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
index 0a8d78fb86..0d14dbe7ed 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java
@@ -330,9 +330,7 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
             if (!serverConfig.isBootstrapServerIs() && (serverConfig.getShortServerId() < 1 || serverConfig.getShortServerId() > 65534)) {
                 throw new DeviceCredentialsValidationException("LwM2M Server ShortServerId must not be less than 1 and more than 65534!");
             }
-           if (serverConfig.isBootstrapServerIs() && !(serverConfig.getShortServerId() == null || serverConfig.getShortServerId() ==0)) {
-                throw new DeviceCredentialsValidationException("Bootstrap Server ShortServerId must be null or '0'!");
-            }
+
             String server = serverConfig.isBootstrapServerIs() ? "Bootstrap Server" : "LwM2M Server";
             if (!shortServerIds.add(serverConfig.getShortServerId())) {
                 throw new DeviceCredentialsValidationException(server + " \"Short server Id\" value = " + serverConfig.getShortServerId() + ". This value must be a unique value for all servers!");