[jbossweb-commits] JBossWeb SVN: r1316 - trunk/java/org/apache/catalina/connector.

Author: mmillson Date: 2009-12-04 11:50:03 -0500 (Fri, 04 Dec 2009) New Revision: 1316 Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Log: Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153] Modified: trunk/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-03 15:16:51 UTC (rev 1315) +++ trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-04 16:50:03 UTC (rev 1316) @@ -652,6 +652,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();