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-9.4.x'

This commit is contained in:
Joakim Erdfelt 2016-05-04 09:16:38 -07:00
parent 3decd95de9 bec06de61d
commit 00543724ec
8 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURIParseTest.java
View File

@ -71,7 +71,7 @@ public class HttpURIParseTest
{"/path/info;param#fragment",null,null,null,"/path/info;param","param",null,"fragment"},
{"/path/info;param?query",null,null,null,"/path/info;param","param","query",null},
{"/path/info;param?query#fragment",null,null,null,"/path/info;param","param","query","fragment"},
// FIXME: {"/path/info;a=b/foo;c=d",null,null,null,"/data/info;a=b/foo;c=d","foo=bar1",null,null},
{"/path/info;a=b/foo;c=d",null,null,null,"/path/info;a=b/foo;c=d","c=d",null,null}, // TODO #405
// Protocol Less (aka scheme-less) URIs
{"//host/path/info",null,"host",null,"/path/info",null,null,null},

4
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -2182,8 +2182,8 @@ public class Request implements HttpServletRequest
/* ------------------------------------------------------------ */
/**
* @param sessionManager
* The sessionManager to set.
* @param sessionHandler
* The SessionHandler to set.
*/
public void setSessionHandler(SessionHandler sessionHandler)
{

2
jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionCacheFactory.java
View File

@ -65,7 +65,7 @@ public class DefaultSessionCacheFactory implements SessionCacheFactory
}
/**
* @see org.eclipse.jetty.server.session.SessionCacheFactory#getSessionStore(org.eclipse.jetty.server.session.SessionHandler)
* @see org.eclipse.jetty.server.session.SessionCacheFactory#getSessionCache(SessionHandler)
*/
@Override
public SessionCache getSessionCache (SessionHandler handler)

2
jetty-server/src/main/java/org/eclipse/jetty/server/session/DefaultSessionIdManager.java
View File

@ -104,7 +104,7 @@ public class DefaultSessionIdManager extends AbstractLifeCycle implements Sessio
/* ------------------------------------------------------------ */
/**
* @param inspector inspector of sessions
* @param houseKeeper the housekeeper
*/
public void setSessionHouseKeeper (HouseKeeper houseKeeper)
{

2
jetty-server/src/main/java/org/eclipse/jetty/server/session/FileSessionStoreFactory.java
View File

@ -69,7 +69,7 @@ public class FileSessionStoreFactory extends AbstractSessionStoreFactory
/**
* @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler)
* @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionStore(SessionHandler)
*/
@Override
public SessionStore getSessionStore(SessionHandler handler)

2
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionStoreFactory.java
View File

@ -82,7 +82,7 @@ public class JDBCSessionStoreFactory extends AbstractSessionStoreFactory
/**
* @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionDataStore(org.eclipse.jetty.server.session.SessionHandler)
* @see org.eclipse.jetty.server.session.SessionStoreFactory#getSessionStore(SessionHandler)
*/
@Override
public SessionStore getSessionStore(SessionHandler handler)

3
jetty-server/src/main/java/org/eclipse/jetty/server/session/Session.java
View File

@ -920,9 +920,6 @@ public class Session implements SessionHandler.SessionIf
/* ------------------------------------------------------------- */
/**
* @see org.eclipse.jetty.server.session.SessionManager.SessionIf#getSession()
*/
@Override
public Session getSession()
{

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

@ -471,7 +471,7 @@ public class SessionHandler extends ScopedHandler
/**
* Returns the <code>HttpSession</code> with the given session id
*
* @param id the session id
* @param extendedId the session id
* @return the <code>HttpSession</code> with the corresponding id or null if no session with the given id exists
*/
public HttpSession getHttpSession(String extendedId)
@ -841,7 +841,7 @@ public class SessionHandler extends ScopedHandler
/**
* Sets the session id URL path parameter name.
*
* @param parameterName the URL path parameter name for session id URL rewriting (null or "none" for no rewriting).
* @param param the URL path parameter name for session id URL rewriting (null or "none" for no rewriting).
* @see #getSessionIdPathParameterName()
* @see #getSessionIdPathParameterNamePrefix()
*/