From e8937f967aff90f350e1360ce2f465cc2bc0c225 Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Fri, 6 May 2016 05:37:06 -0700 Subject: [PATCH] KillSwitch implementations should implement KillSwitch (#20459) --- akka-stream/src/main/scala/akka/stream/KillSwitch.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala index fa5e8e1d1b..c0bb6800ab 100644 --- a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala +++ b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala @@ -159,7 +159,7 @@ trait KillSwitch { * It is also possible to individually cancel, complete or fail upstream and downstream parts by calling the corresponding * methods. */ -final class UniqueKillSwitch private[stream] (private val promise: Promise[Done]) { +final class UniqueKillSwitch private[stream] (private val promise: Promise[Done]) extends KillSwitch { /** * After calling [[UniqueKillSwitch#shutdown()]] the running instance of the [[Graph]] of [[FlowShape]] that materialized to the @@ -200,7 +200,7 @@ final class UniqueKillSwitch private[stream] (private val promise: Promise[Done] * * This class is thread-safe, the instance can be passed safely among threads and its methods may be invoked concurrently. */ -final class SharedKillSwitch private[stream] (val name: String) { +final class SharedKillSwitch private[stream] (val name: String) extends KillSwitch { private[this] val shutdownPromise = Promise[Done] private[this] val _flow: Graph[FlowShape[Any, Any], SharedKillSwitch] = new SharedKillSwitchFlow