refactoring

application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java

@@ -95,6 +95,9 @@ public class TbAlarmStatusSubCtx extends TbAbstractSubCtx {
     private void handleAlarmStatusSubscriptionUpdate(TbSubscription<AlarmSubscriptionUpdate> sub, AlarmSubscriptionUpdate subscriptionUpdate) {
         try {
             AlarmInfo alarm = subscriptionUpdate.getAlarm();
+            if (!alarm.getOriginator().equals(subscription.getEntityId())) {
+                return;
+            }
             Set<UUID> alarmsIds = subscription.getAlarmIds();
             if (alarmsIds.contains(alarm.getId().getId())) {
                 if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) {

application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java

@@ -53,7 +53,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
     }
 
     public boolean matches(AlarmInfo alarm) {
-        return alarm.getOriginator().equals(getEntityId()) && !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
+        return !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
                 (this.severityList == null || this.severityList.contains(alarm.getSeverity()));
     }