You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/03 10:49:08 UTC
svn commit: r382741 - in
/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport:
stomp/StompTransportFactory.java tcp/TcpTransportFactory.java
Author: chirino
Date: Fri Mar 3 01:49:07 2006
New Revision: 382741
URL: http://svn.apache.org/viewcvs?rev=382741&view=rev
Log:
Don't use the inactivity monitor when the stomp protocol is in use.
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java?rev=382741&r1=382740&r2=382741&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java Fri Mar 3 01:49:07 2006
@@ -36,7 +36,7 @@
URI tcpURI = new URI(
"tcp://"+location.getHost()+
(location.getPort()>=0 ? ":"+location.getPort() : "")+
- "?wireFormat=stomp"
+ "?wireFormat=stomp&maxInactivityDuration=0"
);
return TransportFactory.bind(brokerId, tcpURI);
} catch (URISyntaxException e) {
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java?rev=382741&r1=382740&r2=382741&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java Fri Mar 3 01:49:07 2006
@@ -72,7 +72,9 @@
if( format instanceof OpenWireFormat )
transport = new WireFormatNegotiator(transport, format, tcpTransport.getMinmumWireFormatVersion());
- transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
+ if( tcpTransport.getMaxInactivityDuration() > 0 ) {
+ transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
+ }
transport = new MutexTransport(transport);
transport = new ResponseCorrelator(transport);
@@ -91,7 +93,9 @@
// temp.getMaxInactivityDuration(), activityMonitor.getReadCounter(),
// activityMonitor.getWriteCounter());
transport = new WireFormatNegotiator(transport, format, tcpTransport.getMinmumWireFormatVersion());
- transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
+ if( tcpTransport.getMaxInactivityDuration() > 0 ) {
+ transport = new InactivityMonitor(transport, tcpTransport.getMaxInactivityDuration());
+ }
return transport;
}