From 1af6648ce9c26e4437543298dd7210515dba6f96 Mon Sep 17 00:00:00 2001
From: zbeacon <ibarkov.ua@gmail.com>
Date: Mon, 16 Jan 2023 10:01:05 +0200
Subject: [PATCH] Merge with develop/3.5

---
 .../org/thingsboard/server/dao/alarm/BaseAlarmService.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 6790c6912b..0ff440d079 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -229,10 +229,8 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
         } else {
             propagatedEntitiesList = new ArrayList<>(getPropagationEntityIds(result));
         }
-        // TODO oldAlarmSeverity
         AlarmInfo alarmInfo = getAlarmInfo(newAlarm.getTenantId(), newAlarm);
-        return new AlarmOperationResult(alarmInfo, true, propagatedEntitiesList);
-        return new AlarmOperationResult(result, true, false, oldAlarmSeverity, propagatedEntitiesList);
+        return new AlarmOperationResult(alarmInfo, true, false, oldAlarmSeverity, propagatedEntitiesList);
     }
 
     @Override