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

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api

This commit is contained in:
Joakim Erdfelt 2019-02-04 19:48:32 -06:00
parent e4df1fe8af 7fca634292
commit 0817928ea6
4 changed files with 6 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
View File

@ -424,7 +424,7 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
{
Connection old_connection = getConnection();
ByteBuffer buffer = (old_connection instanceof Connection.UpgradeFrom) ?
ByteBuffer prefilled = (old_connection instanceof Connection.UpgradeFrom) ?
((Connection.UpgradeFrom)old_connection).onUpgradeFrom() :
null;
old_connection.onClose();
@ -432,11 +432,11 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
if (LOG.isDebugEnabled())
LOG.debug("{} upgrading from {} to {} with {}",
this, old_connection, newConnection, BufferUtil.toDetailString(buffer));
this, old_connection, newConnection, BufferUtil.toDetailString(prefilled));
if (newConnection instanceof Connection.UpgradeTo)
((Connection.UpgradeTo)newConnection).onUpgradeTo(buffer);
else if (BufferUtil.hasContent(buffer))
((Connection.UpgradeTo)newConnection).onUpgradeTo(prefilled);
else if (BufferUtil.hasContent(prefilled))
throw new IllegalStateException("Cannot upgrade: " + newConnection + " does not implement " + Connection.UpgradeTo.class.getName());
newConnection.onOpen();

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

@ -144,15 +144,6 @@ public class Session implements SessionHandler.SessionIf
};
}
/**
* For backward api compatibility only.
* @see #schedule(long)
*/
@Deprecated
public void schedule ()
{
schedule(calculateInactivityTimeout(System.currentTimeMillis()));
}
/**
* @param time the timeout to set; -1 means that the timer will not be
@ -544,12 +535,6 @@ public class Session implements SessionHandler.SessionIf
}
@Deprecated
public void updateInactivityTimer()
{
//for backward api compatibility only
}
/**
* Calculate what the session timer setting should be based on:
* the time remaining before the session expires
@ -1058,18 +1043,6 @@ public class Session implements SessionHandler.SessionIf
return result;
}
/* ------------------------------------------------------------- */
/**
* Call HttpSessionAttributeListeners as part of invalidating a Session.
*
* @throws IllegalStateException if no session manager can be find
*/
@Deprecated
protected void doInvalidate() throws IllegalStateException
{
finishInvalidate();
}
/* ------------------------------------------------------------- */
/**
* Call HttpSessionAttributeListeners as part of invalidating a Session.

24
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionCache.java
View File

@ -91,25 +91,6 @@ public interface SessionCache extends LifeCycle
*/
Session newSession (SessionData data);
/**
* Change the id of a session.
*
* This method has been superceded by the 4 arg renewSessionId method and
* should no longer be called.
*
* @param oldId the old id
* @param newId the new id
* @return the changed Session
* @throws Exception if anything went wrong
* @deprecated use
* {@link #renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId)}
*/
@Deprecated
default Session renewSessionId(String oldId, String newId) throws Exception
{
return null;
}
/**
* Change the id of a Session.
@ -121,10 +102,7 @@ public interface SessionCache extends LifeCycle
* @return the Session after changing its id
* @throws Exception if any error occurred
*/
default Session renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId) throws Exception
{
return renewSessionId(oldId, newId);
}
Session renewSessionId(String oldId, String newId, String oldExtendedId, String newExtendedId) throws Exception;

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

@ -1372,17 +1372,7 @@ public class SessionHandler extends ScopedHandler
}
}
/**
* @see #sessionInactivityTimerExpired(Session, long)
*/
@Deprecated
public void sessionInactivityTimerExpired (Session session)
{
//for backwards compilation compatibility only
sessionInactivityTimerExpired(session, System.currentTimeMillis());
}
/* ------------------------------------------------------------ */
/**
* Each session has a timer that is configured to go off