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 BB8AB9931 for ; Sun, 5 Feb 2012 21:54:24 +0000 (UTC) Received: (qmail 80762 invoked by uid 500); 5 Feb 2012 21:54:24 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 80712 invoked by uid 500); 5 Feb 2012 21:54:24 -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 80705 invoked by uid 99); 5 Feb 2012 21:54:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Feb 2012 21:54:24 +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; Sun, 05 Feb 2012 21:54:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A9E12388A32 for ; Sun, 5 Feb 2012 21:54:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240839 - in /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker: Connection.scala jetty/WebSocketTransportFactory.scala Date: Sun, 05 Feb 2012 21:54:03 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120205215403.5A9E12388A32@eris.apache.org> Author: chirino Date: Sun Feb 5 21:54:02 2012 New Revision: 1240839 URL: http://svn.apache.org/viewvc?rev=1240839&view=rev Log: Support changing the dispatch queue assigned to a connection. Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala?rev=1240839&r1=1240838&r2=1240839&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala (original) +++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connection.scala Sun Feb 5 21:54:02 2012 @@ -35,7 +35,19 @@ object Connection extends Log abstract class Connection() extends BaseService with Dispatched { import Connection._ - val dispatch_queue = createQueue() + private var _dispatch_queue = createQueue() + def dispatch_queue = _dispatch_queue + + def set_dispatch_queue(next_queue:DispatchQueue)(on_complete: =>Unit) { + _dispatch_queue { + if(transport!=null) { + transport.setDispatchQueue(next_queue) + } + _dispatch_queue = next_queue + on_complete + } + } + var stopped = true var transport:Transport = null var transport_sink:TransportSink = null Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala?rev=1240839&r1=1240838&r2=1240839&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala (original) +++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jetty/WebSocketTransportFactory.scala Sun Feb 5 21:54:02 2012 @@ -189,9 +189,14 @@ object WebSocketTransportFactory extends // Transport interface methods. ///////////////////////////////////////////////////////////////////////// - @BeanProperty var dispatchQueue = createQueue() + def getDispatchQueue: DispatchQueue = dispatchQueue + def setDispatchQueue(queue: DispatchQueue) { + dispatchQueue = queue + drain_outbound_events.setTargetQueue(queue); + } + @BeanProperty var transportListener: TransportListener = _