UNDERTOW-1247 Incorrect behaviour of HttpSession.getLastAccessedTime()

undertow-io · Dec 22, 2017 · dfa0f98 · dfa0f98
1 parent 5ec11dd
commit dfa0f98
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/io/undertow/server/session/InMemorySessionManager.java b/core/src/main/java/io/undertow/server/session/InMemorySessionManager.java
@@ -346,7 +346,7 @@ public long getStartTime() {
     private static class SessionImpl implements Session {
 
 
-        final AttachmentKey<Boolean> FIRST_REQUEST_ACCESS = AttachmentKey.create(Boolean.class);
+        final AttachmentKey<Long> FIRST_REQUEST_ACCESS = AttachmentKey.create(Long.class);
         final InMemorySessionManager sessionManager;
         final ConcurrentMap<String, Object> attributes = new ConcurrentHashMap<>();
         volatile long lastAccessed;
@@ -457,17 +457,20 @@ public String getId() {
         }
 
         void requestStarted(HttpServerExchange serverExchange) {
-            Boolean existing = serverExchange.getAttachment(FIRST_REQUEST_ACCESS);
+            Long existing = serverExchange.getAttachment(FIRST_REQUEST_ACCESS);
             if(existing == null) {
                 if (!invalid) {
-                    lastAccessed = System.currentTimeMillis();
+                    serverExchange.putAttachment(FIRST_REQUEST_ACCESS, System.currentTimeMillis());
                 }
-                serverExchange.putAttachment(FIRST_REQUEST_ACCESS, Boolean.TRUE);
             }
         }
 
         @Override
         public void requestDone(final HttpServerExchange serverExchange) {
+            Long existing = serverExchange.getAttachment(FIRST_REQUEST_ACCESS);
+            if(existing != null) {
+                lastAccessed = existing;
+            }
         }
 
         @Override