activemq-commits mailing list archives

Author: chirino
Date: Tue Feb 19 17:31:44 2013
New Revision: 1447835

URL: http://svn.apache.org/r1447835
Log:
Avoid assertion failure.

Modified:
    activemq/activemq-apollo/trunk/apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala?rev=1447835&r1=1447834&r2=1447835&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala
Tue Feb 19 17:31:44 2013
@@ -856,7 +856,9 @@ case class MqttSession(host_state:HostSt
   /////////////////////////////////////////////////////////////////////
   var producerRoutes = new LRUCache[UTF8Buffer, MqttProducerRoute](10) {
     override def onCacheEviction(eldest: Entry[UTF8Buffer, MqttProducerRoute]) = {
-      host.router.disconnect(Array(eldest.getValue.address), eldest.getValue)
+      host.dispatch_queue {
+        host.router.disconnect(Array(eldest.getValue.address), eldest.getValue)
+      }
     }
   }
   case class MqttProducerRoute(address:SimpleAddress, handler:MqttProtocolHandler) extends
DeliveryProducerRoute(host.router) {

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=1447835&r1=1447834&r2=1447835&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
Tue Feb 19 17:31:44 2013
@@ -97,7 +97,9 @@ class OpenwireProtocolHandler extends Pr
 
   var producerRoutes = new LRUCache[ActiveMQDestination, OpenwireDeliveryProducerRoute](10)
{
     override def onCacheEviction(eldest: Entry[ActiveMQDestination, OpenwireDeliveryProducerRoute])
= {
-      host.router.disconnect(eldest.getValue.addresses, eldest.getValue)
+      host.dispatch_queue {
+        host.router.disconnect(eldest.getValue.addresses, eldest.getValue)
+      }
     }
   }