activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/3] activemq-6 git commit: stomp test fix
Date Wed, 25 Feb 2015 15:40:40 GMT
stomp test fix


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

Branch: refs/heads/master
Commit: 08d29a6905f43d3c81a8acac3ba555e34eddf513
Parents: d415f0d
Author: Andy Taylor <andytaylor@apache.org>
Authored: Wed Feb 25 14:49:59 2015 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Wed Feb 25 14:49:59 2015 +0000

----------------------------------------------------------------------
 .../apache/activemq/core/protocol/stomp/StompProtocolManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/08d29a69/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java
b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java
index 6ce03db..73443fa 100644
--- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java
+++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/StompProtocolManager.java
@@ -37,6 +37,7 @@ import org.apache.activemq.api.core.management.ManagementHelper;
 import org.apache.activemq.core.journal.IOAsyncTask;
 import org.apache.activemq.core.postoffice.BindingType;
 import org.apache.activemq.core.remoting.impl.netty.NettyServerConnection;
+import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.core.server.ActiveMQMessageBundle;
 import org.apache.activemq.core.server.ActiveMQServer;
 import org.apache.activemq.core.server.ActiveMQServerLogger;
@@ -112,7 +113,7 @@ class StompProtocolManager implements ProtocolManager, NotificationListener
       // Note that STOMP 1.0 has no heartbeat, so if connection ttl is non zero, data must
continue to be sent or connection
       // will be timed out and closed!
 
-      String ttlStr = (String) acceptorUsed.getConfiguration().get("connection-ttl");
+      String ttlStr = (String) acceptorUsed.getConfiguration().get(TransportConstants.CONNECTION_TTL);
       Long ttl = ttlStr == null ? null : Long.valueOf(ttlStr);
 
       if (ttl != null)


Mime
View raw message