From fc9078a2be2b78ce8ab6bd6b9ba9c2025f147ac3 Mon Sep 17 00:00:00 2001
From: desoliture <ikozka@thingsboard.io>
Date: Thu, 20 Jan 2022 12:58:55 +0200
Subject: [PATCH] fix case where both shared and client attributes were
 requested

---
 .../server/actors/device/DeviceActorMessageProcessor.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
index bfcb95a71c..baf2e9b03e 100644
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
@@ -473,7 +473,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
                             .addAllClientAttributeList(toTsKvProtos(result.get(0)))
                             .addAllSharedAttributeList(toTsKvProtos(result.get(1)))
                             .setIsMultipleAttributesRequest(
-                                    request.getSharedAttributeNamesCount() > 1 || request.getClientAttributeNamesCount() > 1)
+                                    request.getSharedAttributeNamesCount() + request.getClientAttributeNamesCount() > 1)
                             .build();
                     sendToTransport(responseMsg, sessionInfo);
                 }