Commit 8b98b2e48f0b97dc537a905522a9b21d227f4153

Authored by Volodymyr Babak
1 parent 616c1df3

NullPointer exception fix

... ... @@ -28,7 +28,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
28 28 import org.springframework.stereotype.Service;
29 29 import org.thingsboard.common.util.ThingsBoardThreadFactory;
30 30 import org.thingsboard.server.common.data.DataConstants;
31   -import org.thingsboard.server.common.data.Tenant;
32 31 import org.thingsboard.server.common.data.edge.Edge;
33 32 import org.thingsboard.server.common.data.id.EdgeId;
34 33 import org.thingsboard.server.common.data.id.TenantId;
... ... @@ -180,7 +179,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
180 179 @Override
181 180 public void onEdgeEvent(TenantId tenantId, EdgeId edgeId) {
182 181 log.trace("[{}] onEdgeEvent [{}]", tenantId, edgeId.getId());
183   - if (!sessionNewEvents.get(edgeId)) {
  182 + if (Boolean.FALSE.equals(sessionNewEvents.get(edgeId))) {
184 183 log.trace("[{}] set session new events flag to true [{}]", tenantId, edgeId.getId());
185 184 sessionNewEvents.put(edgeId, true);
186 185 }
... ... @@ -213,7 +212,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
213 212 if (sessions.containsKey(edgeId)) {
214 213 ScheduledFuture<?> schedule = scheduler.schedule(() -> {
215 214 try {
216   - if (sessionNewEvents.get(edgeId)) {
  215 + if (Boolean.TRUE.equals(sessionNewEvents.get(edgeId))) {
217 216 log.trace("[{}] Set session new events flag to false", edgeId.getId());
218 217 sessionNewEvents.put(edgeId, false);
219 218 session.processEdgeEvents();
... ...