From 969053fa87d582a3a2f30602f1a9f84124320585 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Tue, 8 Dec 2015 08:37:50 -0600
Subject: [PATCH] SessionRepositoryMessageInterceptor updates lastAccessedTime

Fixes gh-325
---
 .../SessionRepositoryMessageInterceptor.java  |  1 +
 ...sionRepositoryMessageInterceptorTests.java | 28 ++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java b/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
index a6cd44e..f36352f 100644
--- a/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
+++ b/spring-session/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java
@@ -124,6 +124,7 @@ public final class SessionRepositoryMessageInterceptor<S extends ExpiringSession
 			S session = sessionRepository.getSession(sessionId);
 			if (session != null) {
 				// update the last accessed time
+				session.setLastAccessedTime(System.currentTimeMillis());
 				sessionRepository.save(session);
 			}
 		}
diff --git a/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java b/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
index 3ee4e51..8ab897b 100644
--- a/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
+++ b/spring-session/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java
@@ -23,12 +23,14 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.HttpSession;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.http.server.ServletServerHttpRequest;
@@ -141,7 +143,7 @@ public class SessionRepositoryMessageInterceptorTests {
 
 		assertThat(interceptor.preSend(createMessage(), channel)).isSameAs(createMessage);
 
-		verify(sessionRepository).getSession(anyString());
+		verify(session).setLastAccessedTime(longThat(isAlmostNow()));
 		verify(sessionRepository).save(session);
 	}
 
@@ -151,7 +153,7 @@ public class SessionRepositoryMessageInterceptorTests {
 
 		assertThat(interceptor.preSend(createMessage(), channel)).isSameAs(createMessage);
 
-		verify(sessionRepository).getSession(anyString());
+		verify(session).setLastAccessedTime(longThat(isAlmostNow()));
 		verify(sessionRepository).save(session);
 	}
 
@@ -161,17 +163,18 @@ public class SessionRepositoryMessageInterceptorTests {
 
 		assertThat(interceptor.preSend(createMessage(), channel)).isSameAs(createMessage);
 
-		verify(sessionRepository).getSession(anyString());
+		verify(session).setLastAccessedTime(longThat(isAlmostNow()));
 		verify(sessionRepository).save(session);
 	}
 
 	@Test
 	public void preSendUnsubscribeUpdatesLastUpdateTime() {
 		setMessageType(SimpMessageType.UNSUBSCRIBE);
+		session.setLastAccessedTime(0L);
 
 		assertThat(interceptor.preSend(createMessage(), channel)).isSameAs(createMessage);
 
-		verify(sessionRepository).getSession(anyString());
+		verify(session).setLastAccessedTime(longThat(isAlmostNow()));
 		verify(sessionRepository).save(session);
 	}
 
@@ -253,4 +256,21 @@ public class SessionRepositoryMessageInterceptorTests {
 	private void setMessageType(SimpMessageType type) {
 		headers.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, type);
 	}
+
+	static AlmostNowMatcher isAlmostNow() {
+		return new AlmostNowMatcher();
+	}
+
+	static class AlmostNowMatcher extends ArgumentMatcher<Long> {
+
+		@Override
+		public boolean matches(Object argument) {
+			long other = (Long) argument;
+			long now = System.currentTimeMillis();
+
+			long delta = now - other;
+			return delta >= 0 && delta < TimeUnit.SECONDS.toMillis(3);
+		}
+
+	}
 }