[jbossweb-commits] JBossWeb SVN: r1318 - branches/2.1.x/java/org/apache/catalina/connector.

Author: mmillson Date: 2009-12-04 14:03:33 -0500 (Fri, 04 Dec 2009) New Revision: 1318 Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java Log: Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153] Modified: branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 18:57:36 UTC (rev 1317) +++ branches/2.1.x/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 19:03:33 UTC (rev 1318) @@ -598,6 +598,13 @@ */ protected void parseSessionCookiesId(org.apache.coyote.Request req, Request request) { + // If session tracking via cookies has been disabled for the current + // context, don't go looking for a session ID in a cookie as a cookie + // from a parent context with a session ID may be present which would + // overwrite the valid session ID encoded in the URL + if (!((Context)request.getMappingData().context).getCookies()) + return; + // Parse session id from cookies Cookies serverCookies = req.getCookies(); int count = serverCookies.getCookieCount();