From 7c207f458cc11d2dc69cac911292dc2a76ceabaf Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Mon, 27 Oct 2025 18:12:26 +0200
Subject: [PATCH] remove null check

---
 .../calculatedField/CalculatedFieldEntityMessageProcessor.java  | 2 +-
 .../server/service/cf/ctx/state/BaseCalculatedFieldState.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
index fb0f92c2ab..aef81474ec 100644
--- a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
@@ -416,7 +416,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                 }
             } else {
                 if (DebugModeUtil.isDebugFailuresAvailable(ctx.getCalculatedField())) {
-                    String errorMsg = ctx.isInitialized() && state.getReadinessStatus() != null ? state.getReadinessStatus().stringValue() : "Calculated field state is not initialized!";
+                    String errorMsg = ctx.isInitialized() ? state.getReadinessStatus().stringValue() : "Calculated field state is not initialized!";
                     systemContext.persistCalculatedFieldDebugEvent(tenantId, ctx.getCfId(), entityId, state.getArguments(), tbMsgId, tbMsgType, null,  errorMsg);
                 }
                 callback.onSuccess();
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
index 0383c5890c..fa54b11e9f 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
@@ -112,7 +112,7 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState,
 
     @Override
     public boolean isReady() {
-        return readinessStatus != null && readinessStatus.isReady();
+        return readinessStatus.isReady();
     }
 
     @Override