Lwm2m: merge with master

nickAS21
1 parent fe78b69f
Showing 1 changed file with 1 additions and 1 deletions
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
View file @7f38366
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
View file @7f38366
@@ -469,7 +469,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
                 versionedId = ((TbLwM2MObserveRequest) request).getVersionedId();
             }
             String id = fromVersionedIdToObjectId(versionedId);
-            if (id != null && !client.isResourceMultiInstances(versionedId, modelProvider)) {
+            if (id != null && new LwM2mPath(id).isResource() && !client.isResourceMultiInstances(versionedId, modelProvider)) {
                 return client.getDefaultContentFormat();
             }
             else {