From e29de84766ede4e14a682b7c04021a5e58122e3e Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 17 Sep 2024 18:34:48 +0200
Subject: [PATCH] fixed concurrent modification in TbSubscriptionsInfo

---
 .../server/service/subscription/TbSubscriptionsInfo.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionsInfo.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionsInfo.java
index 48464d5297..a65fc0bedb 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionsInfo.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbSubscriptionsInfo.java
@@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -48,7 +49,7 @@ public class TbSubscriptionsInfo {
     }
 
     protected TbSubscriptionsInfo copy(int seqNumber) {
-        return new TbSubscriptionsInfo(notifications, alarms, tsAllKeys, tsKeys, attrAllKeys, attrKeys, seqNumber);
+        return new TbSubscriptionsInfo(notifications, alarms, tsAllKeys, tsKeys != null ? new HashSet<>(tsKeys) : null, attrAllKeys, attrKeys != null ? new HashSet<>(attrKeys) : null, seqNumber);
     }
 
 }