camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject camel git commit: use the updated property name to disable jsr356 detection
Date Wed, 09 Dec 2015 20:42:25 GMT
Repository: camel
Updated Branches:
  refs/heads/master c0b00733b -> 4adf56cda


use the updated property name to disable jsr356 detection


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4adf56cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4adf56cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4adf56cd

Branch: refs/heads/master
Commit: 4adf56cda8822fd2db0bd5908e9b4fe81cfc541f
Parents: c0b0073
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Wed Dec 9 21:42:02 2015 +0100
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Wed Dec 9 21:42:02 2015 +0100

----------------------------------------------------------------------
 .../camel/component/atmosphere/websocket/WebsocketConsumer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4adf56cd/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 743851c..3c6ad9f 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,7 +51,8 @@ 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
-        framework.addInitParameter("org.atmosphere.suppressDetectingJSR356", "true");
+        //TODO switch to use contant ApplicationConfig.WEBSOCKET_SUPPRESS_JSR356 aftr atmosphere-2.4.2
+        framework.addInitParameter("org.atmosphere.websocket.suppressJSR356", "true");
         framework.init();
         
         WebSocketProtocol wsp = framework.getWebSocketProtocol();


Mime
View raw message