Don't append the jvmRoute to a session ID if the jvmRoute is a zero length string.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087128 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/util/SessionIdGenerator.java b/java/org/apache/catalina/util/SessionIdGenerator.java
index 49ce6b7..0e6b115 100644 (file)
--- a/java/org/apache/catalina/util/SessionIdGenerator.java
+++ b/java/org/apache/catalina/util/SessionIdGenerator.java
@@ -168,7 +168,7 @@ public class SessionIdGenerator {
             }
         }
 
-        if (jvmRoute != null) {
+        if (jvmRoute != null && jvmRoute.length() > 0) {
             buffer.append('.').append(jvmRoute);
         }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a74e363..9af035c 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
         name ending in <code>.jar</code> to be treated as an expanded JAR file
         by the default JarScanner. Based on patch by Rodion Zhitomirsky. (markt)
       </fix>
+      <fix>
+        Don&apos;t append the jvmRoute to a session ID if the jvmRoute is a zero
+        length string. (markt) 
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">