From 233dafc444f60851be398acd00cee587701c7c51 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 9 Jan 2018 10:04:23 +0300 Subject: [PATCH] UpdateMode option renamed --- .../java/org/redisson/tomcat/RedissonSessionManager.java | 9 ++++----- .../java/org/redisson/tomcat/RedissonSessionManager.java | 4 ++-- .../java/org/redisson/tomcat/RedissonSessionManager.java | 4 ++-- .../java/org/redisson/tomcat/RedissonSessionManager.java | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 6e3b31aa7..c7857430a 100644 --- a/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -22,8 +22,6 @@ import java.util.Map; import javax.servlet.http.HttpSession; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; import org.apache.catalina.Context; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; @@ -31,11 +29,12 @@ import org.apache.catalina.LifecycleListener; 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; import org.redisson.api.RMap; import org.redisson.api.RedissonClient; import org.redisson.config.Config; -import org.redisson.tomcat.RedissonSessionManager.UpdateMode; /** * Redisson Session Manager for Apache Tomcat @@ -46,7 +45,7 @@ import org.redisson.tomcat.RedissonSessionManager.UpdateMode; public class RedissonSessionManager extends ManagerBase implements Lifecycle { public enum ReadMode {REDIS, MEMORY} - public enum UpdateMode {NONE, AFTER_REQUEST} + public enum UpdateMode {DEFAULT, AFTER_REQUEST} private final Log log = LogFactory.getLog(RedissonSessionManager.class); @@ -55,7 +54,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { private RedissonClient redisson; private String configPath; private ReadMode readMode = ReadMode.MEMORY; - private UpdateMode updateMode = UpdateMode.NONE; + private UpdateMode updateMode = UpdateMode.DEFAULT; public String getUpdateMode() { return updateMode.toString(); diff --git a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 58098925b..0279933c6 100644 --- a/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -44,7 +44,7 @@ import org.redisson.config.Config; public class RedissonSessionManager extends ManagerBase { public enum ReadMode {REDIS, MEMORY} - public enum UpdateMode {NONE, AFTER_REQUEST} + public enum UpdateMode {DEFAULT, AFTER_REQUEST} private final Log log = LogFactory.getLog(RedissonSessionManager.class); @@ -52,7 +52,7 @@ public class RedissonSessionManager extends ManagerBase { private String configPath; private ReadMode readMode = ReadMode.MEMORY; - private UpdateMode updateMode = UpdateMode.NONE; + private UpdateMode updateMode = UpdateMode.DEFAULT; public String getUpdateMode() { return updateMode.toString(); 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 34f20f78b..39995c076 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 @@ -43,7 +43,7 @@ import org.redisson.config.Config; public class RedissonSessionManager extends ManagerBase { public enum ReadMode {REDIS, MEMORY} - public enum UpdateMode {NONE, AFTER_REQUEST} + public enum UpdateMode {DEFAULT, AFTER_REQUEST} private final Log log = LogFactory.getLog(RedissonSessionManager.class); @@ -51,7 +51,7 @@ public class RedissonSessionManager extends ManagerBase { private String configPath; private ReadMode readMode = ReadMode.MEMORY; - private UpdateMode updateMode = UpdateMode.NONE; + private UpdateMode updateMode = UpdateMode.DEFAULT; public String getUpdateMode() { return updateMode.toString(); diff --git a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java index 34f20f78b..39995c076 100644 --- a/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java +++ b/redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java @@ -43,7 +43,7 @@ import org.redisson.config.Config; public class RedissonSessionManager extends ManagerBase { public enum ReadMode {REDIS, MEMORY} - public enum UpdateMode {NONE, AFTER_REQUEST} + public enum UpdateMode {DEFAULT, AFTER_REQUEST} private final Log log = LogFactory.getLog(RedissonSessionManager.class); @@ -51,7 +51,7 @@ public class RedissonSessionManager extends ManagerBase { private String configPath; private ReadMode readMode = ReadMode.MEMORY; - private UpdateMode updateMode = UpdateMode.NONE; + private UpdateMode updateMode = UpdateMode.DEFAULT; public String getUpdateMode() { return updateMode.toString(); -- GitLab