diff options
author | Philipp Haller <hallerp@gmail.com> | 2010-04-22 10:26:29 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2010-04-22 10:26:29 +0000 |
commit | d16e5173035f7a104b62186f748785db3227ea97 (patch) | |
tree | 59e1bd3bbbf6e49fa7ceb278ec60b8c409047fa0 | |
parent | dcbffd4dc50c7e2540fd4770492b86108d3254fc (diff) | |
download | scala-d16e5173035f7a104b62186f748785db3227ea97.tar.gz scala-d16e5173035f7a104b62186f748785db3227ea97.tar.bz2 scala-d16e5173035f7a104b62186f748785db3227ea97.zip |
Reverted change of Reactor.exceptionHandler's t...
Reverted change of Reactor.exceptionHandler's type of see r21650. Review
by plocinic.
-rw-r--r-- | src/actors/scala/actors/Reactor.scala | 4 | ||||
-rw-r--r-- | src/actors/scala/actors/ReactorTask.scala | 3 | ||||
-rw-r--r-- | test/files/jvm/actor-exceptions.scala | 2 |
3 files changed, 4 insertions, 5 deletions
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() diff --git a/test/files/jvm/actor-exceptions.scala b/test/files/jvm/actor-exceptions.scala index 75dc1e4cd5..3ee4db9ed2 100644 --- a/test/files/jvm/actor-exceptions.scala +++ b/test/files/jvm/actor-exceptions.scala @@ -30,7 +30,7 @@ object Master extends Actor { object Slave extends Actor { override def toString = "Slave" - override def exceptionHandler: PartialFunction[Throwable, Unit] = { + override def exceptionHandler: PartialFunction[Exception, Unit] = { case MyException(text) => case other if !other.isInstanceOf[scala.util.control.ControlThrowable] => super.exceptionHandler(other) } |