Merge branch 'master' of github.com:thingsboard/thingsboard

Igor Kulikov
2 parents a17c5b77 82bc7203
Showing 1 changed file with 6 additions and 4 deletions
application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @bffd136
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
View file @bffd136
@@ -283,10 +283,12 @@ public class DefaultTbClusterService implements TbClusterService {
         byte[] msgBytes = encodingService.encode(msg);
         TbQueueProducer<TbProtoQueueMsg<ToRuleEngineNotificationMsg>> toRuleEngineProducer = producerProvider.getRuleEngineNotificationsMsgProducer();
         Set<String> tbRuleEngineServices = new HashSet<>(partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE));
-        if (msg.getEntityId().getEntityType().equals(EntityType.TENANT)
-                || msg.getEntityId().getEntityType().equals(EntityType.TENANT_PROFILE)
-                || msg.getEntityId().getEntityType().equals(EntityType.DEVICE_PROFILE)
-                || msg.getEntityId().getEntityType().equals(EntityType.API_USAGE_STATE)) {
+        EntityType entityType = msg.getEntityId().getEntityType();
+        if (entityType.equals(EntityType.TENANT)
+                || entityType.equals(EntityType.TENANT_PROFILE)
+                || entityType.equals(EntityType.DEVICE_PROFILE)
+                || entityType.equals(EntityType.API_USAGE_STATE)
+                || (entityType.equals(EntityType.DEVICE) && msg.getEvent() == ComponentLifecycleEvent.UPDATED)) {
             TbQueueProducer<TbProtoQueueMsg<ToCoreNotificationMsg>> toCoreNfProducer = producerProvider.getTbCoreNotificationsMsgProducer();
             Set<String> tbCoreServices = partitionService.getAllServiceIds(ServiceType.TB_CORE);
             for (String serviceId : tbCoreServices) {