jinql
/
tomcat-cluster-redis-session-manager
mirror of https://github.com/ran-jit/tomcat-cluster-redis-session-manager
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for - The method setMaxInactiveInterval of session is not effective

pull/15/head
Ranjith 2017-11-26 17:41:26 +05:30
parent c67ef154e8
commit 2720d91581
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/tomcat/request/session/redis/SessionManager.java
View File

@ -143,7 +143,7 @@ public class SessionManager extends ManagerBase implements Lifecycle {
initialize();
log.info("The sessions will expire after " + (getSessionTimeout()) + " seconds.");
log.info("The sessions will expire after " + (getSessionTimeout(null)) + " seconds.");
context.setDistributable(true);
}
@ -171,7 +171,7 @@ public class SessionManager extends ManagerBase implements Lifecycle {
session.setNew(true);
session.setValid(true);
session.setCreationTime(System.currentTimeMillis());
session.setMaxInactiveInterval(getSessionTimeout());
session.setMaxInactiveInterval(getSessionTimeout(session));
session.tellNew();
}
setValues(sessionId, session, false, new SessionMetadata());
@ -230,7 +230,7 @@ public class SessionManager extends ManagerBase implements Lifecycle {
newSession.setNew(false);
newSession.setValid(true);
newSession.resetDirtyTracking();
newSession.setMaxInactiveInterval(getSessionTimeout());
newSession.setMaxInactiveInterval(getSessionTimeout(newSession));
session = newSession;
isPersisted = true;
@ -310,7 +310,7 @@ public class SessionManager extends ManagerBase implements Lifecycle {
setValues(true, metadata);
}
int timeout = getSessionTimeout();
int timeout = getSessionTimeout(newSession);
this.dataCache.expire(newSession.getId(), timeout);
log.trace("Session [" + newSession.getId() + "] expire in [" + timeout + "] seconds.");
@ -346,9 +346,10 @@ public class SessionManager extends ManagerBase implements Lifecycle {
/**
* @return
*/
private int getSessionTimeout() {
private int getSessionTimeout(Session session) {
int timeout = getContextIns().getSessionTimeout() * 60;
return (timeout < 1800) ? 1800 : timeout;
int sessionTimeout = (session == null) ? 0 : session.getMaxInactiveInterval() * 60;
return (sessionTimeout < timeout) ? ((timeout < 1800) ? 1800 : timeout) : sessionTimeout;
}
/**