From b0381de67aa9a92b727cb616bc00f91145aa63fc Mon Sep 17 00:00:00 2001 From: Faisal Ahmed Date: Mon, 12 Mar 2018 10:04:47 +0900 Subject: [PATCH] fixed missing colon problem in user defined key prefix. --- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 3 ++- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 3 ++- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 3 ++- .../main/java/org/redisson/tomcat/RedissonSessionManager.java | 3 ++- 4 files changed, 8 insertions(+), 4 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 585df5ce7..29dcba552 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 @@ -140,7 +140,8 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle { } public RMap getMap(String sessionId) { - return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId); + String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; + return redisson.getMap(keyPrefix + separator + "redisson_tomcat_session:" + sessionId); } @Override 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 66dd91d79..691caf322 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 @@ -120,7 +120,8 @@ public class RedissonSessionManager extends ManagerBase { } public RMap getMap(String sessionId) { - return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId); + String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; + return redisson.getMap(keyPrefix + separator + "redisson_tomcat_session:" + sessionId); } @Override 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 35d4d84f9..e710753c9 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 @@ -119,7 +119,8 @@ public class RedissonSessionManager extends ManagerBase { } public RMap getMap(String sessionId) { - return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId); + String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; + return redisson.getMap(keyPrefix + separator + "redisson_tomcat_session:" + sessionId); } @Override 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 b370552f5..b8da6512a 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 @@ -119,7 +119,8 @@ public class RedissonSessionManager extends ManagerBase { } public RMap getMap(String sessionId) { - return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId); + String separator = keyPrefix == null || keyPrefix.isEmpty() ? "" : ":"; + return redisson.getMap(keyPrefix + separator + "redisson_tomcat_session:" + sessionId); } @Override