From d5f954d3df6dca19c10793cac55f5fc315829b19 Mon Sep 17 00:00:00 2001
From: nick <nick@avalr.com.ua>
Date: Wed, 12 Jun 2024 07:45:14 +0300
Subject: [PATCH] fix_bug: lwm2m Bootstrap ShortServerId must not be less than
 0 and more than 65535!

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

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 0d14dbe7ed..a26b419d9c 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
@@ -331,6 +331,10 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
                 throw new DeviceCredentialsValidationException("LwM2M Server ShortServerId must not be less than 1 and more than 65534!");
             }
 
+            if (serverConfig.isBootstrapServerIs() && !(serverConfig.getShortServerId() < 0 || serverConfig.getShortServerId() > 65535)) {
+                throw new DeviceCredentialsValidationException("Bootstrap Server ShortServerId must not be less than 0 and more than 65535!");
+            }
+
             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!");