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 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x

This commit is contained in:
Jan Bartel 2020-09-22 12:08:45 +02:00
parent e5d7e668b8 00d403170d
commit a283c4c93b
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-maven-plugin/src/it/jetty-start-mojo-multi-module-single-war-it/postbuild.groovy
View File

@ -21,7 +21,7 @@ assert buildLog.text.contains( 'Started Server' )
assert buildLog.text.contains( '(1a) >> javax.servlet.ServletContextListener loaded from jar:' )
assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.3/jetty-servlet-api-4.0.3.jar!/javax/servlet/ServletContextListener.class << (1b)' )
assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.4/jetty-servlet-api-4.0.4.jar!/javax/servlet/ServletContextListener.class << (1b)' )
assert buildLog.text.contains( '(2a) >> mca.common.CommonService loaded from file:' )
assert buildLog.text.contains( 'common/target/classes/mca/common/CommonService.class << (2b)' )

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

@ -179,7 +179,6 @@ public class SessionHandler extends ScopedHandler
protected String _sessionPath;
protected int _maxCookieAge = -1;
protected int _refreshCookieAge;
protected boolean _nodeIdInSessionId;
protected boolean _checkingRemoteSessionIdEncoding;
protected String _sessionComment;
protected SessionCache _sessionCache;
@ -961,22 +960,6 @@ public class SessionHandler extends ScopedHandler
_sessionCache = cache;
}
/**
* @return true if the cluster node id (worker id) is returned as part of the session id by {@link HttpSession#getId()}. Default is false.
*/
public boolean isNodeIdInSessionId()
{
return _nodeIdInSessionId;
}
/**
* @param nodeIdInSessionId true if the cluster node id (worker id) will be returned as part of the session id by {@link HttpSession#getId()}. Default is false.
*/
public void setNodeIdInSessionId(boolean nodeIdInSessionId)
{
_nodeIdInSessionId = nodeIdInSessionId;
}
/**
* Remove session from manager
*

2
pom.xml
View File

@ -24,7 +24,7 @@
<logback.version>1.3.0-alpha5</logback.version>
<spring-version>5.1.1.RELEASE</spring-version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
<servlet.api.version>4.0.3</servlet.api.version>
<servlet.api.version>4.0.4</servlet.api.version>
<websocket.api.version>1.1.2</websocket.api.version>
<jsp.version>9.0.29</jsp.version>
<infinispan.version>9.4.8.Final</infinispan.version>