dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hot fixes.

Browse Source
This commit is contained in:
Igor Kulikov 2018-03-06 16:17:43 +02:00
parent 2babd41ccc
commit f10cd0eac4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-compose.yml
View File

@ -39,7 +39,7 @@ services:
volumes: volumes:
- "${CASSANDRA_DATA_DIR}:/var/lib/cassandra" - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
zk: zk:
image: "zookeeper:3.4.9" image: "zookeeper:3.4.10"
ports: ports:
- "2181" - "2181"
restart: always restart: always

2
docker/zookeeper/Dockerfile
View File

@ -22,7 +22,7 @@ ZK_LOG_DIR=/var/log/zookeeper \
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ARG GPG_KEY=C823E3E5B12AF29C67F81976F5CECB3CB5E9BD2D ARG GPG_KEY=C823E3E5B12AF29C67F81976F5CECB3CB5E9BD2D
ARG ZK_DIST=zookeeper-3.4.9 ARG ZK_DIST=zookeeper-3.4.10
RUN set -x \ RUN set -x \
&& apt-get update \ && apt-get update \
&& apt-get install -y openjdk-8-jre-headless wget netcat-openbsd \ && apt-get install -y openjdk-8-jre-headless wget netcat-openbsd \

3
extensions-core/src/main/java/org/thingsboard/server/extensions/core/plugin/telemetry/SubscriptionManager.java
View File

@ -17,6 +17,7 @@ package org.thingsboard.server.extensions.core.plugin.telemetry;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.DataConstants;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.EntityId; 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<AttributeKvEntry> attributes) { public void onAttributesUpdateFromServer(PluginContext ctx, EntityId entityId, String scope, List<AttributeKvEntry> attributes) {
Optional<ServerAddress> serverAddress = ctx.resolve(entityId); Optional<ServerAddress> serverAddress = ctx.resolve(entityId);
if (!serverAddress.isPresent()) { 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<TsKvEntry> subscriptionUpdate = new ArrayList<TsKvEntry>(); List<TsKvEntry> subscriptionUpdate = new ArrayList<TsKvEntry>();
for (AttributeKvEntry kv : attributes) { for (AttributeKvEntry kv : attributes) {
if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) { if (s.isAllKeys() || s.getKeyStates().containsKey(kv.getKey())) {