Fixed #109 by including only newer notifications in poll

devicehive · Oct 12, 2015 · 42ed91f · 42ed91f
1 parent c24077d
commit 42ed91f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/main/java/com/devicehive/resource/impl/DeviceNotificationResourceImpl.java b/src/main/java/com/devicehive/resource/impl/DeviceNotificationResourceImpl.java
@@ -167,6 +167,9 @@ private void getOrWaitForNotifications(final HivePrincipal principal, final Stri
                     DEFAULT_TAKE, principal);
         }
 
+        // polling expects only notifications after timestamp to be returned
+        list.removeIf(n -> !n.getTimestamp().after(timestamp));
+
         if (!list.isEmpty()) {
             Response response;
             if (isMany) {