From d16e5173035f7a104b62186f748785db3227ea97 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Thu, 22 Apr 2010 10:26:29 +0000 Subject: Reverted change of Reactor.exceptionHandler's t... Reverted change of Reactor.exceptionHandler's type of see r21650. Review by plocinic. --- src/actors/scala/actors/Reactor.scala | 4 ++-- src/actors/scala/actors/ReactorTask.scala | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/actors') diff --git a/src/actors/scala/actors/Reactor.scala b/src/actors/scala/actors/Reactor.scala index 41f959d8f9..fe00e216d3 100644 --- a/src/actors/scala/actors/Reactor.scala +++ b/src/actors/scala/actors/Reactor.scala @@ -85,10 +85,10 @@ trait Reactor[Msg >: Null] extends OutputChannel[Msg] with Combinators { def act(): Unit /** - * This partial function is applied to `Throwable`s that propagate out of + * This partial function is applied to exceptions that propagate out of * this $actor's body. */ - protected[actors] def exceptionHandler: PartialFunction[Throwable, Unit] = + protected[actors] def exceptionHandler: PartialFunction[Exception, Unit] = Map() protected[actors] def scheduler: IScheduler = diff --git a/src/actors/scala/actors/ReactorTask.scala b/src/actors/scala/actors/ReactorTask.scala index b4e09ef7f8..c379334f2f 100644 --- a/src/actors/scala/actors/ReactorTask.scala +++ b/src/actors/scala/actors/ReactorTask.scala @@ -39,8 +39,7 @@ private[actors] class ReactorTask[Msg >: Null](var reactor: Reactor[Msg], case _: KillActorControl => // do nothing - case e: Throwable if !e.isInstanceOf[SuspendActorControl] && - reactor.exceptionHandler.isDefinedAt(e) => + case e: Exception if reactor.exceptionHandler.isDefinedAt(e) => reactor.exceptionHandler(e) } reactor.kill() -- cgit v1.2.3