Browse Source

Fix subscription service: ignore unmatched updates.

pull/875/head
Igor Kulikov 8 years ago
parent
commit
1f58c1b0d6
  1. 1
      application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
  2. 2
      application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

1
application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java

@ -46,7 +46,6 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements Telemetr
private static final ConcurrentMap<String, String> externalSessionMap = new ConcurrentHashMap<>();
@Autowired
@Lazy
private TelemetryWebSocketService webSocketService;
@Override

2
application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

@ -432,7 +432,7 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio
deviceSubscriptions.stream().filter(filter).forEach(s -> {
String sessionId = s.getWsSessionId();
List<TsKvEntry> subscriptionUpdate = f.apply(s);
if (subscriptionUpdate == null || !subscriptionUpdate.isEmpty()) {
if (subscriptionUpdate != null && !subscriptionUpdate.isEmpty()) {
SubscriptionUpdate update = new SubscriptionUpdate(s.getSubscriptionId(), subscriptionUpdate);
if (s.isLocal()) {
updateSubscriptionState(sessionId, s, update);

Loading…
Cancel
Save