activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject git commit: fix for: https://issues.apache.org/jira/browse/AMQ-4740
Date Wed, 23 Oct 2013 16:25:00 GMT
Updated Branches:
  refs/heads/trunk ae1da749b -> 0f09f78f3


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/0f09f78f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0f09f78f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0f09f78f

Branch: refs/heads/trunk
Commit: 0f09f78f3e04a712b0b066d0b2710c3d0af749e4
Parents: ae1da74
Author: Timothy Bish <tabish121@gmai.com>
Authored: Wed Oct 23 12:23:30 2013 -0400
Committer: Timothy Bish <tabish121@gmai.com>
Committed: Wed Oct 23 12:24:48 2013 -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/0f09f78f/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


Mime
View raw message