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

Minor fixes

Browse Source
This commit is contained in:
Igor Kulikov 2022-01-14 18:29:37 +02:00
parent ff17387767
commit e2e12d5871
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
View File

@ -178,8 +178,6 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
log.debug("[{}][{}] Updating data using query: {}", session.getSessionId(), cmd.getCmdId(), cmd.getQuery()); log.debug("[{}][{}] Updating data using query: {}", session.getSessionId(), cmd.getCmdId(), cmd.getQuery());
} }
ctx.setAndResolveQuery(cmd.getQuery()); ctx.setAndResolveQuery(cmd.getQuery());
TenantId tenantId = ctx.getTenantId();
CustomerId customerId = ctx.getCustomerId();
EntityDataQuery query = ctx.getQuery(); EntityDataQuery query = ctx.getQuery();
//Step 1. Update existing query with the contents of LatestValueCmd //Step 1. Update existing query with the contents of LatestValueCmd
if (cmd.getLatestCmd() != null) { if (cmd.getLatestCmd() != null) {

2
application/src/main/java/org/thingsboard/server/service/subscription/TbAbstractDataSubCtx.java
View File

@ -74,7 +74,7 @@ public abstract class TbAbstractDataSubCtx<T extends AbstractDataQuery<? extends
@Override @Override
public boolean isDynamic() { public boolean isDynamic() {
return query.getPageLink().isDynamic(); return query != null && query.getPageLink().isDynamic();
} }
@Override @Override