You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/08/31 06:41:09 UTC
[2/2] camel git commit: CAMEL-11725 - Fixed CS
CAMEL-11725 - Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/781c48a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/781c48a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/781c48a4
Branch: refs/heads/master
Commit: 781c48a44c66fa420eda0e49651a48edd5cad235
Parents: 181c741
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 31 08:29:08 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 31 08:29:08 2017 +0200
----------------------------------------------------------------------
.../atmosphere/websocket/WebsocketConsumer.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/781c48a4/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 08537fc..d912a2b 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
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -29,11 +30,11 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.servlet.ServletConsumer;
-import org.atmosphere.cpr.AtmosphereResponseImpl;
-import org.atmosphere.cpr.AtmosphereRequestImpl;
import org.atmosphere.cpr.ApplicationConfig;
import org.atmosphere.cpr.AtmosphereFramework;
import org.atmosphere.cpr.AtmosphereFrameworkInitializer;
+import org.atmosphere.cpr.AtmosphereRequestImpl;
+import org.atmosphere.cpr.AtmosphereResponseImpl;
import org.atmosphere.websocket.WebSocketProtocol;
/**
@@ -45,7 +46,13 @@ public class WebsocketConsumer extends ServletConsumer {
private AtmosphereFramework framework;
private final AtmosphereFrameworkInitializer initializer;
- public void configureEventsResending(final boolean enableEventsResending){
+
+ public WebsocketConsumer(WebsocketEndpoint endpoint, Processor processor) {
+ super(endpoint, processor);
+ initializer = new AtmosphereFrameworkInitializer(false, true);
+ }
+
+ public void configureEventsResending(final boolean enableEventsResending) {
this.enableEventsResending = enableEventsResending;
}
@@ -55,7 +62,7 @@ public class WebsocketConsumer extends ServletConsumer {
this.framework.setUseNativeImplementation(false);
this.framework.addInitParameter(ApplicationConfig.WEBSOCKET_SUPPORT, "true");
this.framework.addInitParameter(ApplicationConfig.WEBSOCKET_PROTOCOL,
- getEndpoint().isUseStreaming() ? WebsocketStreamHandler.class.getName() : WebsocketHandler.class.getName());
+ getEndpoint().isUseStreaming() ? WebsocketStreamHandler.class.getName() : WebsocketHandler.class.getName());
this.framework.init(config);
WebSocketProtocol wsp = this.framework.getWebSocketProtocol();
@@ -66,16 +73,11 @@ public class WebsocketConsumer extends ServletConsumer {
}
}
- public WebsocketConsumer(WebsocketEndpoint endpoint, Processor processor) {
- super(endpoint, processor);
- initializer = new AtmosphereFrameworkInitializer(false , true);
- }
-
@Override
public WebsocketEndpoint getEndpoint() {
return (WebsocketEndpoint)super.getEndpoint();
}
-
+
void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
this.queryMap = getQueryMap(request.getQueryString());
framework.doCometSupport(AtmosphereRequestImpl.wrap(request), AtmosphereResponseImpl.wrap(response));