From 3bace7756bb7426c534f36d3dff9fe4b46f1b407 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Tue, 19 Oct 2021 13:13:05 +0300
Subject: [PATCH] Lwm2m fix bug if model == null

---
 .../lwm2m/server/LwM2mVersionedModelProvider.java          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
index 9448d9c0a4..ad31c674c3 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mVersionedModelProvider.java
@@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
                 if (objectModel != null)
                     return objectModel.resources.get(resourceId);
                 else
-                    log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server", objectId, resourceId);
+                    log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server.", objectId, resourceId);
                 return null;
             } catch (Exception e) {
                 log.error("", e);
@@ -128,14 +128,17 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider {
         private ObjectModel getObjectModelDynamic(Integer objectId, String version) {
             String key = getKeyIdVer(objectId, version);
             ObjectModel objectModel = models.get(tenantId).get(key);
-
             if (objectModel == null) {
                 modelsLock.lock();
                 try {
                     objectModel = models.get(tenantId).get(key);
                     if (objectModel == null) {
                         objectModel = getObjectModel(key);
+                    }
+                    if (objectModel != null) {
                         models.get(tenantId).put(key, objectModel);
+                    } else {
+                        log.error("Object model with id [{}] version [{}] not found on the server.", objectId, version);
                     }
                 } finally {
                     modelsLock.unlock();