Showing
1 changed file
with
5 additions
and
2 deletions
| @@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { | @@ -95,7 +95,7 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { | ||
| 95 | if (objectModel != null) | 95 | if (objectModel != null) |
| 96 | return objectModel.resources.get(resourceId); | 96 | return objectModel.resources.get(resourceId); |
| 97 | else | 97 | else |
| 98 | - log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server", objectId, resourceId); | 98 | + log.trace("TbResources (Object model) with id [{}/0/{}] not found on the server.", objectId, resourceId); |
| 99 | return null; | 99 | return null; |
| 100 | } catch (Exception e) { | 100 | } catch (Exception e) { |
| 101 | log.error("", e); | 101 | log.error("", e); |
| @@ -128,14 +128,17 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { | @@ -128,14 +128,17 @@ public class LwM2mVersionedModelProvider implements LwM2mModelProvider { | ||
| 128 | private ObjectModel getObjectModelDynamic(Integer objectId, String version) { | 128 | private ObjectModel getObjectModelDynamic(Integer objectId, String version) { |
| 129 | String key = getKeyIdVer(objectId, version); | 129 | String key = getKeyIdVer(objectId, version); |
| 130 | ObjectModel objectModel = models.get(tenantId).get(key); | 130 | ObjectModel objectModel = models.get(tenantId).get(key); |
| 131 | - | ||
| 132 | if (objectModel == null) { | 131 | if (objectModel == null) { |
| 133 | modelsLock.lock(); | 132 | modelsLock.lock(); |
| 134 | try { | 133 | try { |
| 135 | objectModel = models.get(tenantId).get(key); | 134 | objectModel = models.get(tenantId).get(key); |
| 136 | if (objectModel == null) { | 135 | if (objectModel == null) { |
| 137 | objectModel = getObjectModel(key); | 136 | objectModel = getObjectModel(key); |
| 137 | + } | ||
| 138 | + if (objectModel != null) { | ||
| 138 | models.get(tenantId).put(key, objectModel); | 139 | models.get(tenantId).put(key, objectModel); |
| 140 | + } else { | ||
| 141 | + log.error("Object model with id [{}] version [{}] not found on the server.", objectId, version); | ||
| 139 | } | 142 | } |
| 140 | } finally { | 143 | } finally { |
| 141 | modelsLock.unlock(); | 144 | modelsLock.unlock(); |