Merge pull request #1 from jcoleman/master

full

Author: zhangwei5095

.gitignore

@@ -4,3 +4,5 @@ example-app/build/*
 example-app/.gradle/*
 .DS_Store
 .rspec
+*.iml
+.idea/*

README.markdown

@@ -40,6 +40,13 @@ Finalized branches include:
 * `tomcat-7`: Has been merged into `master`. Compatible with Java 6 or 7.
 * `java-7`: Has been merged into `master`. All of the work from master for Tomcat 7 but taking advantage of new features in Java 7. Compatible with Java 7 only.
 
+Tomcat 8
+--------
+
+Tomcat 8 is not currently supported and has not been tested or developed for at all In fact, as noted in various bug reports, the project currently fails to compile when linked with Tomcat 8.
+
+I currently don't have the time to add Tomcat 8 support in my spare time. However if you're interested in Tomcat 8 support for your particular use case and/or business, as the README notes, I'm available as a consultancy on a contractual basis. If you'd like to pursue getting this feature added at a contract rate (and gain some commercial support as well), feel free to contact me at james@orangefunction.com.
+
 Architecture
 ------------
 

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);