Author: remy.maucherat(a)jboss.com Date: 2010-05-20 18:56:58 -0400 (Thu, 20 May 2010) New Revision: 1476 Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Log: - Use the specified cookie name for the session cookie. Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2010-05-18 22:06:20 UTC (rev 1475) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2010-05-20 22:56:58 UTC (rev 1476) @@ -662,9 +662,13 @@ if (count <= 0) return; + String cookieName = request.getContext().getSessionCookie().getName(); + if (cookieName == null) { + cookieName = Globals.SESSION_COOKIE_NAME; + } for (int i = 0; i < count; i++) { ServerCookie scookie = serverCookies.getCookie(i); - if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) { + if (scookie.getName().equals(cookieName)) { // Override anything requested in the URL if (!request.isRequestedSessionIdFromCookie()) { // Accept only the first session id cookie