From bacb8327605a23a2cc4d884cc969b89eef7ca1b6 Mon Sep 17 00:00:00 2001 From: dshvaika Date: Tue, 16 Dec 2025 11:29:10 +0200 Subject: [PATCH] Moved set partion state restore flag to init method in state --- .../service/cf/DefaultCalculatedFieldProcessingService.java | 6 ++---- .../state/propagation/PropagationCalculatedFieldState.java | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java index 9c9020686b..1ab8f5a076 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java +++ b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java @@ -106,10 +106,8 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF if (ctx.getCfType() != CalculatedFieldType.PROPAGATION) { return Optional.empty(); } - PropagationArgumentEntry argumentEntry = (PropagationArgumentEntry) - resolveArgumentValue(PROPAGATION_CONFIG_ARGUMENT, fetchPropagationCalculatedFieldArgument(ctx, entityId)); - argumentEntry.setPartitionStateRestore(true); - return Optional.of(argumentEntry); + return Optional.of((PropagationArgumentEntry) + resolveArgumentValue(PROPAGATION_CONFIG_ARGUMENT, fetchPropagationCalculatedFieldArgument(ctx, entityId))); } @Override diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java index 3fe06ea4c9..0f1c44d0e2 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java +++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java @@ -69,6 +69,7 @@ public class PropagationCalculatedFieldState extends ScriptCalculatedFieldState super.init(restored); if (restored) { cfProcessingService.fetchPropagationArgumentFromDb(ctx, entityId).ifPresent(fromDb -> { + fromDb.setPartitionStateRestore(true); var update = update(Map.of(PROPAGATION_CONFIG_ARGUMENT, fromDb), ctx); if (update.isEmpty()) { return;