Merge branch 'jetty-8' into release-8
This commit is contained in:
commit
fbadf940be
|
@ -1,4 +1,6 @@
|
||||||
jetty-8.1.7-SNAPSHOT
|
jetty-8.1.7.v20120910 - 10 September 2012
|
||||||
|
+ 388895 Update dependencies for jetty-jndi
|
||||||
|
+ fix busy logging statement re: sessions
|
||||||
|
|
||||||
jetty-8.1.6.v20120903 - 03 September 2012
|
jetty-8.1.6.v20120903 - 03 September 2012
|
||||||
+ 347130 Empty getResourcePaths due to ZipFileClosedException
|
+ 347130 Empty getResourcePaths due to ZipFileClosedException
|
||||||
|
|
|
@ -59,9 +59,8 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-webapp</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||||
|
|
|
@ -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;
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -396,7 +396,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||||
<artifactId>javax.servlet</artifactId>
|
<artifactId>javax.servlet</artifactId>
|
||||||
<version>3.0.0.v201112011016</version>
|
<version>${orbit-servlet-api-version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.orbit</groupId>
|
<groupId>org.eclipse.jetty.orbit</groupId>
|
||||||
|
|
Loading…
Reference in New Issue