From 1ae4fd05b46505a7be3d032ac6fb36511a0dd8b3 Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Thu, 4 Dec 2025 12:19:56 +0200
Subject: [PATCH] Updated SimpleCalculatedFieldState to use constant instead of
 raw value

---
 .../server/service/cf/ctx/state/SimpleCalculatedFieldState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
index 577ff80219..80f5964582 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
@@ -100,7 +100,7 @@ public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
         }
 
         long latestTs = getLatestTimestamp();
-        if (useLatestTs && latestTs != -1) {
+        if (useLatestTs && latestTs != DEFAULT_LAST_UPDATE_TS) {
             ObjectNode resultNode = JacksonUtil.newObjectNode();
             resultNode.put("ts", latestTs);
             resultNode.set("values", valuesNode);