From ff587b5bc75a4f58feed103464e53142d85cdc50 Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <d.skarzh@protonmail.com>
Date: Mon, 17 Apr 2023 13:48:51 +0300
Subject: [PATCH] Review fixes: consistency in null checks

---
 .../rule/engine/metadata/TbGetOriginatorFieldsNode.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
index 691ca232a8..14b816c4ce 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
@@ -49,11 +49,11 @@ public class TbGetOriginatorFieldsNode extends TbAbstractNodeWithFetchTo<TbGetOr
 
     @Override
     protected TbGetOriginatorFieldsConfiguration loadNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException {
-        var getOriginatorFieldsConfiguration = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
-        if (getOriginatorFieldsConfiguration.getFieldsMapping().isEmpty()) {
+        var config = TbNodeUtils.convert(configuration, TbGetOriginatorFieldsConfiguration.class);
+        if (config.getFieldsMapping() == null || config.getFieldsMapping().isEmpty()) {
             throw new TbNodeException("At least one field mapping should be specified!");
         }
-        return getOriginatorFieldsConfiguration;
+        return config;
     }
 
     @Override