Browse Source

refactoring

pull/14781/head
dashevchenko 7 months ago
parent
commit
e82861b3e9
  1. 4
      application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
  2. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvEntry.java

4
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java

@ -348,7 +348,7 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
if (sub.isLatestValues()) {
for (TsKvEntry kv : data) {
Long stateTs = keyStates.get(kv.getKey());
if (stateTs == null || kv.getTs() >= stateTs || kv.isDeletedEntryMarker()) {
if (stateTs == null || kv.getTs() >= stateTs || kv.isDeletedEntry()) {
if (updateData == null) {
updateData = new ArrayList<>();
}
@ -362,7 +362,7 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer
for (TsKvEntry kv : data) {
Long stateTs = keyStates.get(kv.getKey());
if (stateTs != null) {
if (!sub.isLatestValues() || kv.getTs() >= stateTs || kv.isDeletedEntryMarker()) {
if (!sub.isLatestValues() || kv.getTs() >= stateTs || kv.isDeletedEntry()) {
if (updateData == null) {
updateData = new ArrayList<>();
}

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/TsKvEntry.java

@ -38,7 +38,7 @@ public interface TsKvEntry extends KvEntry, HasVersion {
}
@JsonIgnore
default boolean isDeletedEntryMarker() {
default boolean isDeletedEntry() {
return getTs() == 0 && (getValue() == null || getValueAsString().isEmpty());
}

Loading…
Cancel
Save