activemq git commit: https://issues.apache.org/jira/browse/AMQ-6676

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6676

tabish
Repository: activemq
Updated Branches:
  refs/heads/master 88efa01e1 -> 0eb11bf0a


https://issues.apache.org/jira/browse/AMQ-6676

Handle continuation frames on the test client WS transport.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0eb11bf0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0eb11bf0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0eb11bf0

Branch: refs/heads/master
Commit: 0eb11bf0a1c23517106627bb1f1f0cc93c6ea2fd
Parents: 88efa01
Author: Timothy Bish <[hidden email]>
Authored: Tue May 16 10:53:23 2017 -0400
Committer: Timothy Bish <[hidden email]>
Committed: Tue May 16 10:53:23 2017 -0400

----------------------------------------------------------------------
 .../transport/amqp/client/transport/NettyWSTransport.java       | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/0eb11bf0/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
index f995863..bf0c193 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/transport/NettyWSTransport.java
@@ -34,6 +34,7 @@ import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
@@ -155,6 +156,10 @@ public class NettyWSTransport extends NettyTcpTransport {
                 BinaryWebSocketFrame binaryFrame = (BinaryWebSocketFrame) frame;
                 LOG.trace("WebSocket Client received data: {} bytes", binaryFrame.content().readableBytes());
                 listener.onData(binaryFrame.content());
+            } else if (frame instanceof ContinuationWebSocketFrame) {
+                ContinuationWebSocketFrame binaryFrame = (ContinuationWebSocketFrame) frame;
+                LOG.trace("WebSocket Client received data continuation: {} bytes", binaryFrame.content().readableBytes());
+                listener.onData(binaryFrame.content());
             } else if (frame instanceof PingWebSocketFrame) {
                 LOG.trace("WebSocket Client received ping, response with pong");
                 ch.write(new PongWebSocketFrame(frame.content()));