merge from master

This commit is contained in:
Jesse McConnell 2012-09-10 13:14:24 -05:00
commit 62322beaa9
1 changed files with 2 additions and 3 deletions

View File

@ -21,7 +21,6 @@ package org.eclipse.jetty.server.session;
import java.io.IOException; import java.io.IOException;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.EventListener; import java.util.EventListener;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.SessionTrackingMode; import javax.servlet.SessionTrackingMode;
@ -236,7 +235,7 @@ public class SessionHandler extends ScopedHandler
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**
* Look for a requested session ID in cookies and URI parameters * Look for a requested session ID in cookies and URI parameters
* *
* @param baseRequest * @param baseRequest
* @param request * @param request
*/ */
@ -273,7 +272,7 @@ public class SessionHandler extends ScopedHandler
requested_session_id = cookies[i].getValue(); requested_session_id = cookies[i].getValue();
requested_session_id_from_cookie = true; requested_session_id_from_cookie = true;
LOG.info("Got Session ID {} from cookie",requested_session_id); LOG.debug("Got Session ID {} from cookie",requested_session_id);
if (requested_session_id != null) if (requested_session_id != null)
{ {