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 2012/08/16 04:00:13 UTC

svn commit: r1373689 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala

Author: chirino
Date: Thu Aug 16 02:00:13 2012
New Revision: 1373689

URL: http://svn.apache.org/viewvc?rev=1373689&view=rev
Log:
Always set the blocking executors on transports.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala?rev=1373689&r1=1373688&r2=1373689&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/Connector.scala Thu Aug 16 02:00:13 2012
@@ -232,6 +232,7 @@ class AcceptingConnector(val broker:Brok
     protocol = ProtocolFactory.get(config.protocol.getOrElse("any")).get
     transport_server = TransportFactory.bind( config.bind )
     transport_server.setDispatchQueue(dispatch_queue)
+    transport_server.setBlockingExecutor(Broker.BLOCKABLE_THREAD_POOL);
     transport_server.setTransportServerListener(BrokerAcceptListener)
 
     transport_server match {
@@ -242,7 +243,6 @@ class AcceptingConnector(val broker:Brok
 
     transport_server match {
       case transport_server:SslTransportServer =>
-        transport_server.setBlockingExecutor(Broker.BLOCKABLE_THREAD_POOL);
         if( broker.key_storage!=null ) {
           transport_server.setTrustManagers(broker.key_storage.create_trust_managers)
           transport_server.setKeyManagers(broker.key_storage.create_key_managers)