Repository: camel Updated Branches: refs/heads/master de9a1390a -> 236b227af
temporary workaround to make it work with atmosphere-2.4.x + jetty-9.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/236b227a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/236b227a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/236b227a Branch: refs/heads/master Commit: 236b227af014bce1479452b4e7feb834dd96034e Parents: de9a139 Author: Akitoshi Yoshida <a...@apache.org> Authored: Wed Dec 9 00:17:08 2015 +0100 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Wed Dec 9 00:17:23 2015 +0100 ---------------------------------------------------------------------- .../camel/component/atmosphere/websocket/WebsocketConsumer.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/236b227a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java index 5bbda28..743851c 100644 --- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java +++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java @@ -50,6 +50,8 @@ public class WebsocketConsumer extends ServletConsumer { framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPORT, "true"); framework.addInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL, endpoint.isUseStreaming() ? WebsocketStreamHandler.class.getName() : WebsocketHandler.class.getName()); + //REVISIT we need to disable JSR356 detection for now when using jetty-9.3 when using atmosphere-2.4.x + framework.addInitParameter("org.atmosphere.suppressDetectingJSR356", "true"); framework.init(); WebSocketProtocol wsp = framework.getWebSocketProtocol();
