summaryrefslogtreecommitdiff
path: root/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-01-09 16:53:51 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-01-09 16:53:51 +0000
commitb84a68ff43c5c4e3e05fb6d0ce57f7c0a9099fb1 (patch)
tree2867fab56872f3b9d5913f7feb8088e7818e03eb /java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
parent4956baf2bfa881f24c0ecbac3469135a0aef2d2d (diff)
downloadqpid-python-b84a68ff43c5c4e3e05fb6d0ce57f7c0a9099fb1.tar.gz
QPID-5459 : Add WebSocket transport support to the Java Broker and AMQP 1-0 JMS client
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1556873 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java')
-rwxr-xr-xjava/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index 47b578c4ef..b2b585f692 100755
--- a/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
@@ -38,6 +38,7 @@ import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.plugin.ProtocolEngineCreator;
+import org.apache.qpid.transport.Binary;
import org.apache.qpid.transport.Sender;
import org.apache.qpid.transport.network.NetworkConnection;
import org.apache.qpid.transport.network.security.SSLStatus;
@@ -274,9 +275,9 @@ public class MultiVersionProtocolEngine implements ServerProtocolEngine
public void received(ByteBuffer msg)
{
-
_lastReadTime = System.currentTimeMillis();
- ByteBuffer msgheader = msg.duplicate();
+ ByteBuffer msgheader = msg.duplicate().slice();
+
if(_header.remaining() > msgheader.limit())
{
msg.position(msg.limit());
@@ -329,6 +330,7 @@ public class MultiVersionProtocolEngine implements ServerProtocolEngine
}
}
+
if(newDelegate == null && looksLikeSSL(headerBytes))
{
if(_sslContext != null)