From 99a9c5964e51b2651e50f9333e9f6026ef344aa1 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Thu, 22 Oct 2015 15:29:12 +0200 Subject: [PATCH] =str #18763 remove unused parameter in PoolConductor --- .../scala/akka/http/impl/engine/client/PoolConductor.scala | 6 +++--- .../main/scala/akka/http/impl/engine/client/PoolFlow.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala index a5d5a9dba8..feb9809891 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala @@ -64,12 +64,12 @@ private object PoolConductor { +---------+ */ - def apply(slotCount: Int, maxRetries: Int, pipeliningLimit: Int, log: LoggingAdapter): Graph[Ports, Any] = + def apply(slotCount: Int, pipeliningLimit: Int, log: LoggingAdapter): Graph[Ports, Any] = FlowGraph.create() { implicit b ⇒ import FlowGraph.Implicits._ val retryMerge = b.add(MergePreferred[RequestContext](1, eagerClose = true)) - val slotSelector = b.add(new SlotSelector(slotCount, maxRetries, pipeliningLimit, log)) + val slotSelector = b.add(new SlotSelector(slotCount, pipeliningLimit, log)) val route = b.add(new Route(slotCount)) val retrySplit = b.add(Broadcast[RawSlotEvent](2)) val flatten = Flow[RawSlotEvent].mapAsyncUnordered(slotCount) { @@ -106,7 +106,7 @@ private object PoolConductor { private case class Busy(openRequests: Int) extends SlotState { require(openRequests > 0) } private object Busy extends Busy(1) - private class SlotSelector(slotCount: Int, maxRetries: Int, pipeliningLimit: Int, log: LoggingAdapter) + private class SlotSelector(slotCount: Int, pipeliningLimit: Int, log: LoggingAdapter) extends GraphStage[FanInShape2[RequestContext, SlotEvent, SwitchCommand]] { private val ctxIn = Inlet[RequestContext]("requestContext") diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala index a6d00908a7..42aea1c9c2 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala @@ -74,7 +74,7 @@ private object PoolFlow { import settings._ import FlowGraph.Implicits._ - val conductor = b.add(PoolConductor(maxConnections, maxRetries, pipeliningLimit, log)) + val conductor = b.add(PoolConductor(maxConnections, pipeliningLimit, log)) val slots = Vector .tabulate(maxConnections)(PoolSlot(_, connectionFlow, remoteAddress, settings)) .map(b.add(_))