Fixed #109 by including only newer commands in poll

devicehive · Oct 12, 2015 · 638f983 · 638f983
1 parent 42ed91f
commit 638f983
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/com/devicehive/resource/impl/DeviceCommandResourceImpl.java b/src/main/java/com/devicehive/resource/impl/DeviceCommandResourceImpl.java
@@ -109,6 +109,8 @@ private void getOrWaitForCommands(HivePrincipal principal, final String devices,
         if (timestamp != null) {
             list = commandService.find(deviceGuids, commandNames, timestamp, null, Constants.DEFAULT_TAKE, false, principal);
         }
+        // polling expects only commands after timestamp to be returned
+        list.removeIf(c -> !c.getTimestamp().after(timestamp));
 
         if (!list.isEmpty()) {
             Response response;