From f10cd0eac4044abc45dc0f14b33fa55bed1a6ecf Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 6 Mar 2018 16:17:43 +0200 Subject: [PATCH] Hot fixes. --- docker/docker-compose.yml | 2 +- docker/zookeeper/Dockerfile | 2 +- .../extensions/core/plugin/telemetry/SubscriptionManager.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ca0afd7832..6662a8f95f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -39,7 +39,7 @@ services: volumes: - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra" zk: - image: "zookeeper:3.4.9" + image: "zookeeper:3.4.10" ports: - "2181" restart: always diff --git a/docker/zookeeper/Dockerfile b/docker/zookeeper/Dockerfile index 37e52026fb..38f13fca14 100644 --- a/docker/zookeeper/Dockerfile +++ b/docker/zookeeper/Dockerfile @@ -22,7 +22,7 @@ ZK_LOG_DIR=/var/log/zookeeper \ JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ARG GPG_KEY=C823E3E5B12AF29C67F81976F5CECB3CB5E9BD2D -ARG ZK_DIST=zookeeper-3.4.9 +ARG ZK_DIST=zookeeper-3.4.10 RUN set -x \ && apt-get update \ && apt-get install -y openjdk-8-jre-headless wget netcat-openbsd \ diff --git a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java index 3d957ee9e5..ec00677af5 100644 --- a/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java +++ b/extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java @@ -17,6 +17,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; @@ -211,7 +212,7 @@ public class SubscriptionManager { public void onAttributesUpdateFromServer(PluginContext ctx, EntityId entityId, String scope, List attributes) { Optional serverAddress = ctx.resolve(entityId); if (!serverAddress.isPresent()) { - onLocalSubscriptionUpdate(ctx, entityId, s -> SubscriptionType.ATTRIBUTES == s.getType() && scope.equals(s.getScope()), s -> { + onLocalSubscriptionUpdate(ctx, entityId, s -> SubscriptionType.ATTRIBUTES == s.getType() && (StringUtils.isEmpty(s.getScope()) || scope.equals(s.getScope())), s -> { List subscriptionUpdate = new ArrayList(); for (AttributeKvEntry kv : attributes) { if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) {