Lwm2m: merge with master

5 years ago · 7f38366a47
1 changed files with 1 additions and 1 deletions
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
@ -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 {