From 39ff7af478a3b7cc8234e6ab634c147dda128e56 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 16 Jul 2021 17:57:34 +0300
Subject: [PATCH 1/3] update fw/sw strategy

---
 .../lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java       | 5 +++++
 1 file changed, 5 insertions(+)

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 ae724cb86c..dc754dea97 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
@@ -199,6 +199,11 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
                 }
             }, executor);
         }
+
+        var clientSettings = clientContext.getProfile(client.getProfileId()).getClientLwM2mSettings();
+
+        onFirmwareStrategyUpdate(client, clientSettings);
+        onCurrentSoftwareStrategyUpdate(client, clientSettings);
     }
 
     @Override

From 621752cb7a74f14bc7c36c57472262b5561bce07 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 16 Jul 2021 18:50:00 +0300
Subject: [PATCH 2/3] fixed getOrInitSwInfo

---
 .../lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dc754dea97..9dff58324e 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
@@ -552,7 +552,7 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
             if (info == null) {
                 var profile = clientContext.getProfile(client.getProfileId());
                 info = new LwM2MClientSwOtaInfo(endpoint, profile.getClientLwM2mSettings().getSwUpdateResource(),
-                        LwM2MSoftwareUpdateStrategy.fromStrategySwByCode(profile.getClientLwM2mSettings().getFwUpdateStrategy()));
+                        LwM2MSoftwareUpdateStrategy.fromStrategySwByCode(profile.getClientLwM2mSettings().getSwUpdateStrategy()));
                 update(info);
             }
             return info;

From eb3ceabaf7a493fe19b971a0b100a0fc668e8686 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Mon, 19 Jul 2021 12:15:06 +0300
Subject: [PATCH 3/3] Correct initialization order.

---
 .../lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 9dff58324e..7a70714b5a 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
@@ -173,6 +173,11 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
             attributesToFetch.add(SOFTWARE_VERSION);
             attributesToFetch.add(SOFTWARE_URL);
         }
+        
+        var clientSettings = clientContext.getProfile(client.getProfileId()).getClientLwM2mSettings();
+
+        onFirmwareStrategyUpdate(client, clientSettings);
+        onCurrentSoftwareStrategyUpdate(client, clientSettings);
 
         if (!attributesToFetch.isEmpty()) {
             var future = attributesService.getSharedAttributes(client, attributesToFetch);
@@ -199,11 +204,6 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
                 }
             }, executor);
         }
-
-        var clientSettings = clientContext.getProfile(client.getProfileId()).getClientLwM2mSettings();
-
-        onFirmwareStrategyUpdate(client, clientSettings);
-        onCurrentSoftwareStrategyUpdate(client, clientSettings);
     }
 
     @Override