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