Author: mmillson
Date: 2009-12-08 17:19:08 -0500 (Tue, 08 Dec 2009)
New Revision: 1327
Modified:
branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java
Log:
Fix parent context cookie overwriting URL encoded cookie for [JBWEB-153]
Modified:
branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-08
22:18:50 UTC (rev 1326)
+++
branches/JBOSSWEB_2_0_0_GA_CP11_JBPAPP-3233/src/share/classes/org/apache/catalina/connector/CoyoteAdapter.java 2009-12-08
22:19:08 UTC (rev 1327)
@@ -500,6 +500,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();