Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7F4FBE9F8 for ; Tue, 19 Feb 2013 17:32:07 +0000 (UTC) Received: (qmail 56990 invoked by uid 500); 19 Feb 2013 17:32:07 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 56945 invoked by uid 500); 19 Feb 2013 17:32:07 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 56938 invoked by uid 99); 19 Feb 2013 17:32:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 17:32:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 17:32:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BFFDD238890B; Tue, 19 Feb 2013 17:31:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1447835 - in /activemq/activemq-apollo/trunk: apollo-mqtt/src/main/scala/org/apache/activemq/apollo/mqtt/MqttProtocolHandler.scala apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala Date: Tue, 19 Feb 2013 17:31:44 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130219173144.BFFDD238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) + } } }