From 59070804a78f793aaa3c8bbcb9c2a89dbcb59f92 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Fri, 17 Dec 2021 14:33:58 +0200
Subject: [PATCH] lwm2m: if error BootstrapRead - update without find Server ID

---
 .../store/LwM2MBootstrapConfigStoreTaskProvider.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
index 74ca2ca92a..5c4e442875 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/store/LwM2MBootstrapConfigStoreTaskProvider.java
@@ -84,7 +84,7 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements BootstrapTaskProvi
                         this.initAfterBootstrapDiscover(discoverResponse);
                         findSecurityInstanceId(discoverResponse.getObjectLinks());
                     } else {
-                        log.info(
+                        log.warn(
                                 "Bootstrap Discover return error {} : to continue bootstrap session without autoIdForSecurityObject mode. {}",
                                 discoverResponse, session);
                     }
@@ -100,7 +100,13 @@ public class LwM2MBootstrapConfigStoreTaskProvider implements BootstrapTaskProvi
                     return tasks;
                 }
                 BootstrapReadResponse readResponse = (BootstrapReadResponse) previousResponse.get(0);
-                findServerInstanceId(readResponse);
+                if (readResponse.isSuccess()) {
+                    findServerInstanceId(readResponse);
+                } else {
+                    log.warn(
+                            "Bootstrap ReadResponse return error {} : to continue bootstrap session without find Server Instance Id. {}",
+                            readResponse, session);
+                }
                 // create requests from config
                 tasks.requestsToSend = this.toRequests(config,
                         config.contentFormat != null ? config.contentFormat : session.getContentFormat());