Author: markt
Date: Sat May 15 20:23:06 2010
New Revision: 944712
URL: http://svn.apache.org/viewvc?rev=944712&view=rev
Log:
Revert r944511
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=944712&r1=944711&r2=944712&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Sat May
15 20:23:06 2010
@@ -753,13 +753,7 @@ public class CoyoteAdapter implements Ad
for (int i = 0; i < count; i++) {
ServerCookie scookie = serverCookies.getCookie(i);
- String scName;
- if (context == null) {
- scName = Globals.SESSION_COOKIE_NAME;
- } else {
- scName = context.getSessionCookieName();
- }
- if (scookie.getName().equals(scName)) {
+ if (scookie.getName().equals(sessionCookieName)) {
// Override anything requested in the URL
if (!request.isRequestedSessionIdFromCookie()) {
// Accept only the first session id cookie
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
