Commit 18635bf887bd7b779a93a0eb94b322768f5cf355

Authored by Igor Kulikov
2 parents 085044e6 be86a2df

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

@@ -422,7 +422,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl @@ -422,7 +422,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl
422 private void sendReadRequests(LwM2mClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { 422 private void sendReadRequests(LwM2mClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) {
423 Set<String> targetIds = new HashSet<>(profile.getObserveAttr().getAttribute()); 423 Set<String> targetIds = new HashSet<>(profile.getObserveAttr().getAttribute());
424 targetIds.addAll(profile.getObserveAttr().getTelemetry()); 424 targetIds.addAll(profile.getObserveAttr().getTelemetry());
425 - targetIds = diffSets(targetIds, profile.getObserveAttr().getObserve()); 425 + targetIds = diffSets(profile.getObserveAttr().getObserve(), targetIds);
426 targetIds = targetIds.stream().filter(target -> isSupportedTargetId(supportedObjects, target)).collect(Collectors.toSet()); 426 targetIds = targetIds.stream().filter(target -> isSupportedTargetId(supportedObjects, target)).collect(Collectors.toSet());
427 427
428 CountDownLatch latch = new CountDownLatch(targetIds.size()); 428 CountDownLatch latch = new CountDownLatch(targetIds.size());