From c6ce2dbb3d220a129d01f2493665841a4bddc380 Mon Sep 17 00:00:00 2001 From: Ryan Bair Date: Sun, 9 Aug 2015 16:25:35 -0400 Subject: [PATCH] #18151: Fail Futures returned by TCP when connection fails --- .../scala/akka/stream/impl/io/TcpConnectionStream.scala | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TcpConnectionStream.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TcpConnectionStream.scala index a053f212a1..41ab337f10 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TcpConnectionStream.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TcpConnectionStream.scala @@ -335,4 +335,10 @@ private[akka] class OutboundTcpStreamActor(processorPromise: Promise[Processor[B processorPromise.failure(ex) fail(ex) } + + override def fail(e: Throwable): Unit = { + processorPromise.tryFailure(e) + localAddressPromise.tryFailure(e) + super.fail(e) + } }