Repository: activemq Updated Branches: refs/heads/activemq-5.9 6dbbdcc93 -> 196f261ea
fix for: https://issues.apache.org/jira/browse/AMQ-4740 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e7d12691 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e7d12691 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e7d12691 Branch: refs/heads/activemq-5.9 Commit: e7d1269125544696f7cbcd394fa7b971ef839196 Parents: 6dbbdcc Author: Timothy Bish <[email protected]> Authored: Wed Oct 23 12:23:30 2013 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Tue Mar 11 21:01:14 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/activemq/transport/ws/StompSocket.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/e7d12691/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java ---------------------------------------------------------------------- diff --git a/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java b/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java index 25ba1a4..b0da09a 100644 --- a/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java +++ b/activemq-http/src/main/java/org/apache/activemq/transport/ws/StompSocket.java @@ -44,6 +44,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); @Override public void onOpen(Connection connection) { @@ -123,7 +124,7 @@ class StompSocket extends TransportSupport implements WebSocket.OnTextMessage, S @Override public StompInactivityMonitor getInactivityMonitor() { - return null; + return stompInactivityMonitor; } @Override
