diff options
| author | Joakim Erdfelt | 2013-03-11 17:57:08 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2013-03-11 17:57:08 +0000 |
| commit | fd8f2b9753281556cb5859effb7820357f594135 (patch) | |
| tree | f60cb3ea5403e1dce907c7f498fb21a49dc88f42 /jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket | |
| parent | 42013791cc6bbeaeaaa72977d5557f2ec6621353 (diff) | |
| parent | 6be028c040af360f796459e3e1070e0a5d1a37fe (diff) | |
| download | org.eclipse.jetty.project-fd8f2b9753281556cb5859effb7820357f594135.tar.gz org.eclipse.jetty.project-fd8f2b9753281556cb5859effb7820357f594135.tar.xz org.eclipse.jetty.project-fd8f2b9753281556cb5859effb7820357f594135.zip | |
Merge from [master] -> [javawebsocket-jsr]
Diffstat (limited to 'jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket')
| -rw-r--r-- | jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java index 9ce65c4a0b..a022c7f82a 100644 --- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java +++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java @@ -42,15 +42,17 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket; * <pre> * package my.example; * - * import javax.servlet.http.HttpServletRequest; - * import org.eclipse.jetty.websocket.WebSocket; - * import org.eclipse.jetty.websocket.server.WebSocketServlet; + * import org.eclipse.jetty.websocket.servlet.WebSocketServlet; + * import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; * * public class MyEchoServlet extends WebSocketServlet * { * @Override - * public void registerWebSockets(WebSocketServerFactory factory) + * public void configure(WebSocketServletFactory factory) * { + * // set a 10 second idle timeout + * factory.getPolicy().setIdleTimeout(10000); + * // register my socket * factory.register(MyEchoSocket.class); * } * } |