From 7f38366a4757cb6dbae6a100406d487160c93f28 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Tue, 29 Jun 2021 13:14:14 +0300
Subject: [PATCH] Lwm2m: merge with master

---
 .../lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index adbabb4a9e..5c0c9763cc 100644
--- 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 {