From 8a6484203972f2c6b70021fb896680fbe5dda95e Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <dskarzhynets@thingsboard.io>
Date: Wed, 30 Aug 2023 10:44:39 +0300
Subject: [PATCH] Add missing sleep, fix wrong timeout expiry check

---
 .../server/service/state/DefaultDeviceStateService.java         | 2 +-
 .../server/service/state/DefaultDeviceStateServiceTest.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
index cdc5afe361..f9afb5b2e5 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
@@ -486,7 +486,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         if (stateData != null) {
             DeviceState state = stateData.getState();
             if (!isActive(ts, state)
-                    && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() < state.getLastActivityTime())
+                    && (state.getLastInactivityAlarmTime() == 0L || state.getLastInactivityAlarmTime() <= state.getLastActivityTime())
                     && stateData.getDeviceCreationTime() + state.getInactivityTimeout() < ts) {
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                     state.setActive(false);
diff --git a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
index ca30f9e5ed..c0690c56e1 100644
--- a/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/state/DefaultDeviceStateServiceTest.java
@@ -294,6 +294,7 @@ public class DefaultDeviceStateServiceTest {
         Mockito.verify(telemetrySubscriptionService, Mockito.never()).saveAttrAndNotify(Mockito.any(), Mockito.eq(deviceId), Mockito.any(), Mockito.eq("active"), Mockito.any(), Mockito.any());
 
         long newTimeout = 1;
+        Thread.sleep(newTimeout);
 
         service.onDeviceInactivityTimeoutUpdate(tenantId, deviceId, newTimeout);
         activityVerify(false);