From 139e5d28fb7c1fbde33062cd631d66c0adf8987c Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Tue, 13 Dec 2022 10:57:29 +0200 Subject: [PATCH] Fix handleGetTsCmd: add to lastTsMap --- .../DefaultTbEntityDataSubscriptionService.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java index 796a4bfea1..3d9077cb92 100644 --- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java +++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java @@ -564,13 +564,8 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc for (ReadTsKvQueryResult queryResult : queryResults) { String queryKey = queriesKeys.get(queryResult.getQueryId()); if (queryKey != null) { - TsValue[] tsValues = entityData.getTimeseries().get(queryKey); - if (tsValues == null) { - tsValues = queryResult.toTsValues(); - } else { - tsValues = ArrayUtils.addAll(tsValues, queryResult.toTsValues()); - } - entityData.getTimeseries().put(queryKey, tsValues); + entityData.getTimeseries().merge(queryKey, queryResult.toTsValues(), ArrayUtils::addAll); + lastTsMap.merge(queryKey, queryResult.getLastEntryTs(), Math::max); } else { log.warn("ReadTsKvQueryResult for {} {} has queryId not matching the initial query", entityData.getEntityId().getEntityType(), entityData.getEntityId());