You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ay...@apache.org on 2016/01/04 16:37:40 UTC
camel git commit: Use the constant from atmosphere-2.4.2
Repository: camel
Updated Branches:
refs/heads/master 52e6420c7 -> 80c1224b2
Use the constant from atmosphere-2.4.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80c1224b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80c1224b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80c1224b
Branch: refs/heads/master
Commit: 80c1224b262242cd46a2fdcfe6dfd5c9bc3ffce5
Parents: 52e6420
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Jan 5 00:37:15 2016 +0900
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Jan 5 00:37:36 2016 +0900
----------------------------------------------------------------------
.../camel/component/atmosphere/websocket/WebsocketConsumer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/80c1224b/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 3c6ad9f..b1b9b50 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
@@ -51,8 +51,7 @@ public class WebsocketConsumer extends ServletConsumer {
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
- //TODO switch to use contant ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356 aftr atmosphere-2.4.2
- framework.addInitParameter("org.atmosphere.websocket.suppressJSR356", "true");
+ framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356, "true");
framework.init();
WebSocketProtocol wsp = framework.getWebSocketProtocol();