Merge branch 'master' into wip-2239-large-cluster-patriknw

This commit is contained in:
Patrik Nordwall 2012-06-28 18:00:23 +02:00
commit e1f0146a06

View file

@ -40,10 +40,13 @@ private[akka] class NettyRemoteTransport(_system: ExtendedActorSystem, _provider
// TODO replace by system.scheduler
val timer: HashedWheelTimer = new HashedWheelTimer(system.threadFactory)
// TODO make configurable/shareable with server socket factory
val clientChannelFactory = new NioClientSocketChannelFactory(
Executors.newCachedThreadPool(system.threadFactory),
Executors.newCachedThreadPool(system.threadFactory))
val clientChannelFactory = settings.UseDispatcherForIO match {
case Some(id)
val d = system.dispatchers.lookup(id)
new NioClientSocketChannelFactory(d, d)
case None
new NioClientSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool())
}
/**
* Backing scaffolding for the default implementation of NettyRemoteSupport.createPipeline.