svn commit: r1245761 - in /activemq/activemq-apollo/trunk: apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

[ch...@apache.org]

Author: chirino
Date: Fri Feb 17 21:01:42 2012
New Revision: 1245761

URL: http://svn.apache.org/viewvc?rev=1245761&view=rev
Log:
Fixes openwire inactivity timeout bug and fix perf bug assoicated with a logging statement

Modified:
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1245761&r1=1245760&r2=1245761&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Fri Feb 17 21:01:42 2012
@@ -196,7 +196,7 @@ class OpenwireProtocolHandler extends Pr
 
     sink_manager = new SinkMux[Command]( connection.transport_sink.map {x=>
       x.setCommandId(next_command_id)
-      debug("sending openwire command: %s", x.toString())
+      debug("sending openwire command: %s", x)
       x
     })
     connection_session = new OverflowSink(sink_manager.open());
@@ -398,7 +398,7 @@ class OpenwireProtocolHandler extends Pr
     val initial_delay = preferred_wireformat_settings.getMaxInactivityDurationInitalDelay().min(info.getMaxInactivityDurationInitalDelay())
 
     if (inactive_time > 0) {
-      heart_beat_monitor.setReadInterval((inactive_time.min(5000)*1.5).toLong)
+      heart_beat_monitor.setReadInterval(inactive_time)
 
       heart_beat_monitor.setOnDead(^{
         async_die("Stale connection.  Missed heartbeat.")
@@ -618,6 +618,9 @@ class OpenwireProtocolHandler extends Pr
   }
 
   case class OpenwireDeliveryProducerRoute(addresses:Array[SimpleAddress]) extends DeliveryProducerRoute(host.router) {
+
+    override def send_buffer_size =  codec.write_buffer_size
+
     override def connection = Some(OpenwireProtocolHandler.this.connection)
     override def dispatch_queue = queue
     refiller = ^ {

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1245761&r1=1245760&r2=1245761&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Fri Feb 17 21:01:42 2012
@@ -737,7 +737,7 @@ class StompProtocolHandler extends Proto
       consumers = Map()
       security_context.logout( e => {
         if(e!=null) {
-          connection_log.info(e, "STOMP connection '%s' log out error: %s", security_context.remote_address, e.toString)
+          connection_log.info(e, "STOMP connection '%s' log out error: %s", security_context.remote_address, e)
         }
       })
       trace("stomp protocol resources released")