Merge pull request #13 from leitzler/master

Remove expirationTimes entry when session expired

Author: mkopylec

src/main/java/com/github/mkopylec/sessioncouchbase/data/InMemoryDao.java

@@ -6,7 +6,9 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -110,11 +112,15 @@ public void deleteAll() {
     @Override
     public void afterPropertiesSet() throws Exception {
         expirationScheduler.initialize();
-        expirationScheduler.scheduleAtFixedRate(() -> expirationTimes.forEach((documentId, expirationTime) -> {
-            if (expirationTime < currentTimeMillis()) {
-                sessions.remove(documentId);
-                principalSessions.remove(documentId);
+        expirationScheduler.scheduleAtFixedRate(() -> {
+            for(Iterator<Entry<String, Long>> iter = expirationTimes.entrySet().iterator(); iter.hasNext(); ) {
+                Entry<String, Long> entry = iter.next();
+                if (entry.getValue() < currentTimeMillis()) {
+                    sessions.remove(entry.getKey());
+                    principalSessions.remove(entry.getKey());
+                    iter.remove();
+                }
             }
-        }), 1000);
+        }, 1000);
     }
 }