Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release

This commit is contained in:
Jesse McConnell 2012-09-10 12:53:31 -05:00
parent fb929aca20 18539cd903
commit 8da32f2630
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-jndi/pom.xml
View File

@ -59,9 +59,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<artifactId>jetty-server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>

5
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
View File

@ -20,7 +20,6 @@ package org.eclipse.jetty.server.session;
import java.io.IOException;
import java.util.EventListener;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@ -232,7 +231,7 @@ public class SessionHandler extends ScopedHandler
/* ------------------------------------------------------------ */
/**
* Look for a requested session ID in cookies and URI parameters
*
*
* @param baseRequest
* @param request
*/
@ -268,7 +267,7 @@ public class SessionHandler extends ScopedHandler
requested_session_id = cookies[i].getValue();
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)
{