CAMEL-10925: make camel-websocket compatible with Jetty 9.4.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0911b04a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0911b04a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0911b04a Branch: refs/heads/master Commit: 0911b04af6b9a411f1e50252d3cebd0b492dc68a Parents: 94d13a0 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Wed Mar 15 17:29:27 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Wed Mar 15 17:53:31 2017 +0100 ---------------------------------------------------------------------- .../apache/camel/component/websocket/WebsocketComponent.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0911b04a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java index 7e61c07..07694e3 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java @@ -38,11 +38,9 @@ import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.SessionManager; import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.eclipse.jetty.server.session.HashSessionManager; import org.eclipse.jetty.server.session.SessionHandler; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.FilterHolder; @@ -391,8 +389,7 @@ public class WebsocketComponent extends UriEndpointComponent { context.setContextPath("/"); - SessionManager sm = new HashSessionManager(); - SessionHandler sh = new SessionHandler(sm); + SessionHandler sh = new SessionHandler(); context.setSessionHandler(sh); if (home != null) {
