From 4ece91a0fd0915964157ff93997f43f9cc891a0d Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Fri, 21 Nov 2025 13:48:17 +0200
Subject: [PATCH] lwm2m: fix bug progileID is null after reboot if sleep

---
 .../server/client/LwM2mClientContextImpl.java |  2 +-
 .../ota/DefaultLwM2MOtaUpdateService.java     | 58 ++++++++++---------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
index 4cf8d825b9..f5165f47c8 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClientContextImpl.java
@@ -360,7 +360,7 @@ public class LwM2mClientContextImpl implements LwM2mClientContext {
     @Override
     public Lwm2mDeviceProfileTransportConfiguration getProfile(Registration registration) {
         UUID profileId = getClientByEndpoint(registration.getEndpoint()).getProfileId();
-        return doGetAndCache(profileId);
+        return profileId != null ? doGetAndCache(profileId) : null;
     }
 
     private Lwm2mDeviceProfileTransportConfiguration doGetAndCache(UUID profileId) {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
index 79f077a71e..325f1e2280 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
@@ -201,35 +201,39 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
         }
 
         var clientSettings = clientContext.getProfile(client.getRegistration()).getClientLwM2mSettings();
-        initFwStrategy(client, clientSettings);
-        initSwStrategy(client, clientSettings);
-
-        if (!attributesToFetch.isEmpty()) {
-            var future = attributesService.getSharedAttributes(client, attributesToFetch);
-            DonAsynchron.withCallback(future, attrs -> {
-                if (fwInfo.isSupported()) {
-                    Optional<String> newFwTitle = getAttributeValue(attrs, FIRMWARE_TITLE);
-                    Optional<String> newFwVersion = getAttributeValue(attrs, FIRMWARE_VERSION);
-                    Optional<String> newFwTag = getAttributeValue(attrs, FIRMWARE_TAG);
-                    Optional<String> newFwUrl = getAttributeValue(attrs, FIRMWARE_URL);
-                    if (newFwTitle.isPresent() && newFwVersion.isPresent() && !isOtaDownloading(client) && !UPDATING.equals(fwInfo.status)) {
-                        onTargetFirmwareUpdate(client, newFwTitle.get(), newFwVersion.get(), newFwUrl, newFwTag);
+        if (clientSettings != null) {
+            initFwStrategy(client, clientSettings);
+            initSwStrategy(client, clientSettings);
+
+
+            if (!attributesToFetch.isEmpty()) {
+                var future = attributesService.getSharedAttributes(client, attributesToFetch);
+                DonAsynchron.withCallback(future, attrs -> {
+                    if (fwInfo.isSupported()) {
+                        Optional<String> newFwTitle = getAttributeValue(attrs, FIRMWARE_TITLE);
+                        Optional<String> newFwVersion = getAttributeValue(attrs, FIRMWARE_VERSION);
+                        Optional<String> newFwTag = getAttributeValue(attrs, FIRMWARE_TAG);
+                        Optional<String> newFwUrl = getAttributeValue(attrs, FIRMWARE_URL);
+                        if (newFwTitle.isPresent() && newFwVersion.isPresent() && !isOtaDownloading(client) && !UPDATING.equals(fwInfo.status)) {
+                            onTargetFirmwareUpdate(client, newFwTitle.get(), newFwVersion.get(), newFwUrl, newFwTag);
+                        }
                     }
-                }
-                if (swInfo.isSupported()) {
-                    Optional<String> newSwTitle = getAttributeValue(attrs, SOFTWARE_TITLE);
-                    Optional<String> newSwVersion = getAttributeValue(attrs, SOFTWARE_VERSION);
-                    Optional<String> newSwTag = getAttributeValue(attrs, SOFTWARE_TAG);
-                    Optional<String> newSwUrl = getAttributeValue(attrs, SOFTWARE_URL);
-                    if (newSwTitle.isPresent() && newSwVersion.isPresent()) {
-                        onTargetSoftwareUpdate(client, newSwTitle.get(), newSwVersion.get(), newSwUrl, newSwTag);
+                    if (swInfo.isSupported()) {
+                        Optional<String> newSwTitle = getAttributeValue(attrs, SOFTWARE_TITLE);
+                        Optional<String> newSwVersion = getAttributeValue(attrs, SOFTWARE_VERSION);
+                        Optional<String> newSwTag = getAttributeValue(attrs, SOFTWARE_TAG);
+                        Optional<String> newSwUrl = getAttributeValue(attrs, SOFTWARE_URL);
+                        if (newSwTitle.isPresent() && newSwVersion.isPresent()) {
+                            onTargetSoftwareUpdate(client, newSwTitle.get(), newSwVersion.get(), newSwUrl, newSwTag);
+                        }
                     }
-                }
-            }, throwable -> {
-                if (fwInfo.isSupported()) {
-                    update(fwInfo);
-                }
-            }, executor);
+
+                }, throwable -> {
+                    if (fwInfo.isSupported()) {
+                        update(fwInfo);
+                    }
+                }, executor);
+            }
         }
     }