Repository: cxf Updated Branches: refs/heads/master 6f8d4adf3 -> 60be93b7b
update the comment text for the jetty and atmosphere's websocket destination Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/60be93b7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60be93b7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60be93b7 Branch: refs/heads/master Commit: 60be93b7ba531fca9d9458e4f88eb0f252ddc31c Parents: 6f8d4ad Author: Akitoshi Yoshida <[email protected]> Authored: Tue Jun 17 16:46:43 2014 +0200 Committer: Akitoshi Yoshida <[email protected]> Committed: Tue Jun 17 16:46:59 2014 +0200 ---------------------------------------------------------------------- .../transport/websocket/atmosphere/AtmosphereWebSocketHandler.java | 1 + .../org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/60be93b7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java index 2a786de..2b17d16 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java @@ -97,6 +97,7 @@ public class AtmosphereWebSocketHandler implements WebSocketProtocol { protected List<AtmosphereRequest> invokeService(WebSocket webSocket, InputStream stream) { LOG.info("invokeService(WebSocket, InputStream)"); + // invoke the service directly as atmosphere's onMessage is not synchronously blocked HttpServletRequest request = null; HttpServletResponse response = null; try { http://git-wip-us.apache.org/repos/asf/cxf/blob/60be93b7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java index e78f876..3f2a79f 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java @@ -103,7 +103,7 @@ class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessa } private void invokeService(final byte[] data, final int offset, final int length) { - // need to invoke the service asynchronously if the websocket's onMessage is synchronously blocked + // invoke the service asynchronously as the jetty websocket's onMessage is synchronously blocked manager.getExecutor().execute(new Runnable() { @Override public void run() {
