From 9ac61280c51c93e6875fcf44a3ff6f79c0822f58 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Wed, 3 Dec 2025 11:46:07 +0200
Subject: [PATCH] return default value for cf interval if 0

---
 .../tenant/profile/DefaultTenantProfileConfiguration.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index c633cc0cd5..915d97398d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -196,6 +196,7 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     private long minAllowedAggregationIntervalInSecForCF = 60;
     @Schema(example = "300")
     private long intermediateAggregationIntervalInSecForCF = 300;
+    @Builder.Default
     @Schema(example = "60")
     private long cfReevaluationCheckInterval = 60;
     @Schema(example = "60")
@@ -255,4 +256,8 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
         return maxRuleNodeExecutionsPerMessage;
     }
 
+    public long getCfReevaluationCheckInterval() {
+        return cfReevaluationCheckInterval <= 0 ? 60 : cfReevaluationCheckInterval;
+    }
+
 }