From 2906d574f52aee800e72318400cd2faf30bb5fdf Mon Sep 17 00:00:00 2001 From: Nikita Date: Wed, 15 Mar 2017 12:08:44 +0300 Subject: [PATCH] Fixed - redisson-tomcat-8 not compatible with Tomcat 8.5.2 #797 --- .../tomcat/RedissonSessionManager.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index e17e7ae57..80d18f91e 100644 --- a/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -18,14 +18,11 @@ package org.redisson.tomcat; import java.io.File; import java.io.IOException; -import org.apache.catalina.Context; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; -import org.apache.catalina.LifecycleListener; import org.apache.catalina.LifecycleState; import org.apache.catalina.Session; import org.apache.catalina.session.ManagerBase; -import org.apache.catalina.util.LifecycleSupport; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.redisson.Redisson; @@ -43,8 +40,6 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { private final Log log = LogFactory.getLog(RedissonSessionManager.class); - protected LifecycleSupport lifecycle = new LifecycleSupport(this); - private RedissonClient redisson; private String configPath; @@ -74,21 +69,6 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { public void unload() throws IOException { } - @Override - public void addLifecycleListener(LifecycleListener listener) { - lifecycle.addLifecycleListener(listener); - } - - @Override - public LifecycleListener[] findLifecycleListeners() { - return lifecycle.findLifecycleListeners(); - } - - @Override - public void removeLifecycleListener(LifecycleListener listener) { - lifecycle.removeLifecycleListener(listener); - } - @Override public Session createSession(String sessionId) { RedissonSession session = (RedissonSession) createEmptySession(); @@ -96,7 +76,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { session.setNew(true); session.setValid(true); session.setCreationTime(System.currentTimeMillis()); - session.setMaxInactiveInterval(((Context) getContainer()).getSessionTimeout() * 60); + session.setMaxInactiveInterval(getContext().getSessionTimeout() * 60); if (sessionId == null) { sessionId = generateSessionId();