Prevent duplicate ‘.jvmRoute’ prefix for sessionIds

Author: heikkipora

src/main/java/com/orangefunction/tomcat/redissessions/RedisSessionManager.java

@@ -344,19 +344,13 @@ public Session createSession(String requestedSessionId) {
 
       // Ensure generation of a unique session identifier.
       if (null != requestedSessionId) {
-        sessionId = requestedSessionId;
-        if (jvmRoute != null) {
-          sessionId += '.' + jvmRoute;
-        }
+        sessionId = sessionIdWithJvmRoute(requestedSessionId, jvmRoute);
         if (jedis.setnx(sessionId.getBytes(), NULL_SESSION) == 0L) {
           sessionId = null;
         }
       } else {
         do {
-          sessionId = generateSessionId();
-          if (jvmRoute != null) {
-            sessionId += '.' + jvmRoute;
-          }
+          sessionId = sessionIdWithJvmRoute(generateSessionId(), jvmRoute);
         } while (jedis.setnx(sessionId.getBytes(), NULL_SESSION) == 0L); // 1 = key set; 0 = key already existed
       }
 
@@ -402,6 +396,14 @@ This ensures that the save(session) at the end of the request
     return session;
   }
 
+  private String sessionIdWithJvmRoute(String sessionId, String jvmRoute) {
+    if (jvmRoute != null) {
+      String jvmRoutePrefix = '.' + jvmRoute;
+      return sessionId.endsWith(jvmRoutePrefix) ? sessionId : sessionId + jvmRoutePrefix;
+    }
+    return sessionId;
+  }
+
   @Override
   public Session createEmptySession() {
     return new RedisSession(this);