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

Issue #207 - Using connection idle-timeout declared in annotation

This commit is contained in:
Joakim Erdfelt 2016-10-12 11:14:15 -07:00
parent 0e9841a3cc
commit 512e0ec076
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
View File

@ -177,6 +177,8 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Rem
addManaged(this.endpointFunctions);
super.doStart();
connection.setMaxIdleTimeout(this.policy.getIdleTimeout());
}
@Override

5
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
View File

@ -730,7 +730,10 @@ public abstract class AbstractWebSocketConnection extends AbstractConnection imp
@Override
public void setMaxIdleTimeout(long ms)
{
getEndPoint().setIdleTimeout(ms);
if(ms >= 0)
{
getEndPoint().setIdleTimeout(ms);
}
}
@Override

3
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/IdleTimeoutTest.java
View File

@ -88,7 +88,8 @@ public class IdleTimeoutTest
client.expectUpgradeResponse();
// This wait should be shorter than client timeout above, but
// longer than server timeout configured in TimeoutServlet
// longer than server timeout configured in FastTimeoutRFCSocket
// eg: websocket server endpoint timeout < this timeout < websocket client idle timeout
client.sleep(TimeUnit.MILLISECONDS,1000);
// Write to server