Repository: activemq Updated Branches: refs/heads/master b9ed01fa5 -> 516c9db43
https://issues.apache.org/jira/browse/AMQ-5155 Modifed version of patch supplied by Claudio Parodi to handle incoming ping frames correctly. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/516c9db4 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/516c9db4 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/516c9db4 Branch: refs/heads/master Commit: 516c9db43b25a9a5679dd854af9a22b7104d27be Parents: b9ed01f Author: Timothy Bish <[email protected]> Authored: Tue Mar 31 16:36:56 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Tue Mar 31 16:36:56 2015 -0400 ---------------------------------------------------------------------- .../transport/ws/jetty8/StompSocket.java | 12 +++++- .../transport/ws/jetty9/StompSocket.java | 15 +++++-- .../java/org/apache/activemq/IDERunner.java | 45 ++++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/516c9db4/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty8/StompSocket.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty8/StompSocket.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty8/StompSocket.java index dba3ca9..fb1c8d4 100644 --- a/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty8/StompSocket.java +++ b/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty8/StompSocket.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.concurrent.CountDownLatch; import org.apache.activemq.command.Command; +import org.apache.activemq.command.KeepAliveInfo; import org.apache.activemq.transport.TransportSupport; import org.apache.activemq.transport.stomp.ProtocolConverter; import org.apache.activemq.transport.stomp.Stomp; @@ -44,7 +45,7 @@ class StompSocket extends TransportSupport implements WebSocket.OnTextMessage, S ProtocolConverter protocolConverter = new ProtocolConverter(this, null); StompWireFormat wireFormat = new StompWireFormat(); private final CountDownLatch socketTransportStarted = new CountDownLatch(1); - private StompInactivityMonitor stompInactivityMonitor = new StompInactivityMonitor(this, wireFormat); + private final StompInactivityMonitor stompInactivityMonitor = new StompInactivityMonitor(this, wireFormat); @Override public void onOpen(Connection connection) { @@ -74,7 +75,13 @@ class StompSocket extends TransportSupport implements WebSocket.OnTextMessage, S try { - protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8")))); + if (data != null) { + if (data.startsWith("\n")) { + sendToActiveMQ(new KeepAliveInfo()); + } + + protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8")))); + } } catch (Exception e) { onException(IOExceptionSupport.create(e)); } @@ -87,6 +94,7 @@ class StompSocket extends TransportSupport implements WebSocket.OnTextMessage, S @Override protected void doStart() throws Exception { socketTransportStarted.countDown(); + stompInactivityMonitor.setTransportListener(getTransportListener()); } @Override http://git-wip-us.apache.org/repos/asf/activemq/blob/516c9db4/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java index 811f228..3b04677 100644 --- a/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java +++ b/activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.concurrent.CountDownLatch; import org.apache.activemq.command.Command; +import org.apache.activemq.command.KeepAliveInfo; import org.apache.activemq.transport.TransportSupport; import org.apache.activemq.transport.stomp.ProtocolConverter; import org.apache.activemq.transport.stomp.Stomp; @@ -45,7 +46,7 @@ class StompSocket extends TransportSupport implements WebSocketListener, StompTr ProtocolConverter protocolConverter = new ProtocolConverter(this, null); StompWireFormat wireFormat = new StompWireFormat(); private final CountDownLatch socketTransportStarted = new CountDownLatch(1); - private StompInactivityMonitor stompInactivityMonitor = new StompInactivityMonitor(this, wireFormat); + private final StompInactivityMonitor stompInactivityMonitor = new StompInactivityMonitor(this, wireFormat); private boolean transportStartedAtLeastOnce() { return socketTransportStarted.getCount() == 0; @@ -54,6 +55,7 @@ class StompSocket extends TransportSupport implements WebSocketListener, StompTr @Override protected void doStart() throws Exception { socketTransportStarted.countDown(); + stompInactivityMonitor.setTransportListener(getTransportListener()); } @Override @@ -118,7 +120,7 @@ class StompSocket extends TransportSupport implements WebSocketListener, StompTr } @Override - public void onWebSocketError(Throwable arg0) { + public void onWebSocketError(Throwable arg0) { } @Override @@ -133,10 +135,15 @@ class StompSocket extends TransportSupport implements WebSocketListener, StompTr } try { - protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8")))); + if (data != null) { + if (data.startsWith("\n")) { + sendToActiveMQ(new KeepAliveInfo()); + } + + protocolConverter.onStompCommand((StompFrame)wireFormat.unmarshal(new ByteSequence(data.getBytes("UTF-8")))); + } } catch (Exception e) { onException(IOExceptionSupport.create(e)); } } - } http://git-wip-us.apache.org/repos/asf/activemq/blob/516c9db4/activemq-http/src/test/java/org/apache/activemq/IDERunner.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/test/java/org/apache/activemq/IDERunner.java b/activemq-http/src/test/java/org/apache/activemq/IDERunner.java new file mode 100644 index 0000000..513c449 --- /dev/null +++ b/activemq-http/src/test/java/org/apache/activemq/IDERunner.java @@ -0,0 +1,45 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq; + +import java.io.File; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.store.kahadb.KahaDBStore; + +public class IDERunner { + + private static final boolean TRANSPORT_TRACE = true; + + public static void main(String[]args) throws Exception { + BrokerService brokerService = new BrokerService(); + + brokerService.addConnector( + "ws://0.0.0.0:61614?trace=" + TRANSPORT_TRACE); + + KahaDBStore store = new KahaDBStore(); + store.setDirectory(new File("target/activemq-data/kahadb")); + + brokerService.setStoreOpenWireVersion(10); + brokerService.setPersistenceAdapter(store); + brokerService.setUseJmx(false); + brokerService.deleteAllMessages(); + + brokerService.start(); + brokerService.waitUntilStopped(); + } +}
