Check whether context is null.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@944511 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 277ec8c..5647825 100644 (file)
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -753,7 +753,13 @@ public class CoyoteAdapter implements Adapter {
 
         for (int i = 0; i < count; i++) {
             ServerCookie scookie = serverCookies.getCookie(i);
-            if (scookie.getName().equals(sessionCookieName)) {
+            String scName;
+            if (context == null) {
+                scName = Globals.SESSION_COOKIE_NAME;
+            } else {
+                scName = context.getSessionCookieName();
+            }
+            if (scookie.getName().equals(scName)) {
                 // Override anything requested in the URL
                 if (!request.isRequestedSessionIdFromCookie()) {
                     // Accept only the first session id cookie