diff --git a/akka-http-core/src/main/scala/akka/http/Http.scala b/akka-http-core/src/main/scala/akka/http/Http.scala index 2ff409ce32..f7707ac3f0 100644 --- a/akka-http-core/src/main/scala/akka/http/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/Http.scala @@ -40,10 +40,10 @@ class HttpExt(config: Config)(implicit system: ActorSystem) extends akka.actor.E val connections: Source[StreamTcp.IncomingConnection, Future[StreamTcp.ServerBinding]] = StreamTcp().bind(endpoint, backlog, options, effectiveSettings.timeouts.idleTimeout) - val layer = serverLayer(effectiveSettings, log) connections.map { case StreamTcp.IncomingConnection(localAddress, remoteAddress, flow) ⇒ + val layer = serverLayer(effectiveSettings, log) IncomingConnection(localAddress, remoteAddress, layer join flow) }.mapMaterialized { tcpBindingFuture ⇒ import system.dispatcher