From 7c1924446b89dd683ca4c784a3d48c9e74f64277 Mon Sep 17 00:00:00 2001 From: nickAS21 Date: Sat, 27 May 2023 13:30:45 +0300 Subject: [PATCH] search_text: equals byteAdditionalInfo == null 2 --- .../server/common/data/BaseDataWithAdditionalInfo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java index 4fff0af083..6e70439943 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/BaseDataWithAdditionalInfo.java @@ -71,8 +71,11 @@ public abstract class BaseDataWithAdditionalInfo extends Ba if (o == null || getClass() != o.getClass()) return false; if (!super.equals(o)) return false; BaseDataWithAdditionalInfo that = (BaseDataWithAdditionalInfo) o; - byte [] additionalInfoBytesForEquals = additionalInfoBytes != null && new String(additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ? null : additionalInfoBytes; - return Arrays.equals(additionalInfoBytesForEquals, that.additionalInfoBytes); + byte [] additionalInfoBytesForEquals = additionalInfoBytes != null && new String(additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ? + null : additionalInfoBytes; + byte [] thatAdditionalInfoBytesForEquals = that.additionalInfoBytes != null && new String(that.additionalInfoBytes, StandardCharsets.UTF_8).equals(("null")) ? + null : that.additionalInfoBytes; + return Arrays.equals(additionalInfoBytesForEquals, thatAdditionalInfoBytesForEquals); } @Override