From 3d4aa2be4121eea72b37f2b0ef0e54de43a64f37 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 15 May 2010 20:23:06 +0000 Subject: [PATCH] Revert r944511 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@944712 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/CoyoteAdapter.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 564782579..277ec8c25 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -753,13 +753,7 @@ public class CoyoteAdapter implements Adapter { 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 -- 2.11.0