From 2c4346b993c6dd6b9c53265e0570e61dd0646183 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Mon, 10 Mar 2025 16:46:55 +0200
Subject: [PATCH 1/2] moved init cf actor before init rule chains

---
 .../server/actors/tenant/TenantActor.java         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
index 4be2024680..ce8ad84682 100644
--- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
@@ -91,6 +91,16 @@ public class TenantActor extends RuleChainManagerActor {
                 isRuleEngine = systemContext.getServiceInfoProvider().isService(ServiceType.TB_RULE_ENGINE);
                 if (isRuleEngine) {
                     if (systemContext.getPartitionService().isManagedByCurrentService(tenantId)) {
+                        try {
+                            //TODO: IM - extend API usage to have CF Exec Enabled? Not in 4.0;
+                            cfActor = ctx.getOrCreateChildActor(new TbStringActorId("CFM|" + tenantId),
+                                    () -> DefaultActorService.CF_MANAGER_DISPATCHER_NAME,
+                                    () -> new CalculatedFieldManagerActorCreator(systemContext, tenantId),
+                                    () -> true);
+                        } catch (Exception e) {
+                            log.info("Failed to init CF Actor.", e);
+                            cantFindTenant = true;
+                        }
                         try {
                             if (getApiUsageState().isReExecEnabled()) {
                                 log.debug("[{}] Going to init rule chains", tenantId);
@@ -98,11 +108,6 @@ public class TenantActor extends RuleChainManagerActor {
                             } else {
                                 log.info("[{}] Skip init of the rule chains due to API limits", tenantId);
                             }
-                            //TODO: IM - extend API usage to have CF Exec Enabled? Not in 4.0;
-                            cfActor = ctx.getOrCreateChildActor(new TbStringActorId("CFM|" + tenantId),
-                                    () -> DefaultActorService.CF_MANAGER_DISPATCHER_NAME,
-                                    () -> new CalculatedFieldManagerActorCreator(systemContext, tenantId),
-                                    () -> true);
                         } catch (Exception e) {
                             log.info("Failed to check ApiUsage \"ReExecEnabled\"!!!", e);
                             cantFindTenant = true;

From cfc5a1f9d5478d274b98ee1be9cdcd320bdcafb5 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Mon, 10 Mar 2025 17:08:11 +0200
Subject: [PATCH 2/2] added check for cf actor

---
 .../org/thingsboard/server/actors/tenant/TenantActor.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
index ce8ad84682..0bd116f806 100644
--- a/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/tenant/TenantActor.java
@@ -99,7 +99,6 @@ public class TenantActor extends RuleChainManagerActor {
                                     () -> true);
                         } catch (Exception e) {
                             log.info("Failed to init CF Actor.", e);
-                            cantFindTenant = true;
                         }
                         try {
                             if (getApiUsageState().isReExecEnabled()) {
@@ -190,6 +189,10 @@ public class TenantActor extends RuleChainManagerActor {
     }
 
     private void onToCalculatedFieldSystemActorMsg(ToCalculatedFieldSystemMsg msg, boolean priority) {
+        if (cfActor == null) {
+            log.warn("[{}] CF Actor is not initialized.", tenantId);
+            return;
+        }
         if (priority) {
             cfActor.tellWithHighPriority(msg);
         } else {