Merge branch 'develop/3.3.2' of https://github.com/Swoq/thingsboard into develop/3.3.2

application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java

@@ -147,18 +147,22 @@ public class DefaultDataUpdateService implements DataUpdateService {
                     if (deviceProfile.getProfileData().has("alarms") &&
                             !deviceProfile.getProfileData().get("alarms").isNull()) {
                         boolean isUpdated = false;
-                        JsonNode array = deviceProfile.getProfileData().get("alarms");
+                        JsonNode alarms = deviceProfile.getProfileData().get("alarms");
-                        for (JsonNode node : array) {
+                        for (JsonNode alarm : alarms) {
-                            if (node.has("createRules")) {
+                            if (alarm.has("createRules")) {
-                                JsonNode createRules = node.get("createRules");
+                                JsonNode createRules = alarm.get("createRules");
                                 for (AlarmSeverity severity : AlarmSeverity.values()) {
                                     if (createRules.has(severity.name())) {
-                                        isUpdated = isUpdated || convertDeviceProfileAlarmRulesForVersion330(createRules.get(severity.name()).get("condition").get("spec"));
+                                        JsonNode spec = createRules.get(severity.name()).get("condition").get("spec");
+                                        if (convertDeviceProfileAlarmRulesForVersion330(spec))
+                                            isUpdated = true;
                                     }
                                 }
                             }
-                            if (node.has("clearRule") && !node.get("clearRule").isNull()) {
+                            if (alarm.has("clearRule") && !alarm.get("clearRule").isNull()) {
-                                isUpdated = isUpdated || convertDeviceProfileAlarmRulesForVersion330(node.get("clearRule").get("condition").get("spec"));
+                                JsonNode spec = alarm.get("clearRule").get("condition").get("spec");
+                                if (convertDeviceProfileAlarmRulesForVersion330(spec))
+                                    isUpdated = true;
                             }
                         }
                         if (isUpdated) {