[jboss-cvs] JBossAS SVN: r105601 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-06-02 17:22:00 -0400 (Wed, 02 Jun 2010)
New Revision: 105601

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
Log:
[JBAS-8052] Do not append jvmRoute to new session id if it is null.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-06-02 21:21:28 UTC (rev 105600)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheManager.java	2010-06-02 21:22:00 UTC (rev 105601)
@@ -529,17 +529,18 @@
          
          if (sessionId == null)
          {
-             sessionId = this.getNextId();
-   
-             // We are using mod_jk for load balancing. Append the JvmRoute.
-             if (getUseJK())
-             {
-                 if (trace_)
-                 {
-                     log_.trace("createSession(): useJK is true. Will append JvmRoute: " + this.getJvmRoute());
-                 }
-                 sessionId += "." + this.getJvmRoute();
-             }
+            sessionId = this.getNextId();
+  
+            String jvmRoute = this.getJvmRoute();
+            // We are using mod_jk for load balancing. Append the JvmRoute if it exists.
+            if (getUseJK() && jvmRoute != null)
+            {
+               if (trace_)
+               {
+                  log_.trace("createSession(): useJK is true. Will append JvmRoute: " + jvmRoute);
+               }
+               sessionId += "." + jvmRoute;
+            }
          }
          else
          {