From 2836cba04cdc42875be1f09376908ca7d805cc49 Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Sun, 21 Jan 2007 14:51:50 +0000
Subject: Inlined detachActor().

---
 src/actors/scala/actors/Actor.scala | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index b220af1396..7054d6735b 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -356,7 +356,8 @@ trait Actor extends OutputChannel[Any] {
       val qel = mailbox.extractFirst((m: Any) => f.isDefinedAt(m))
       if (null eq qel) {
         waitingFor = f.isDefinedAt
-        detachActor(f)
+        continuation = f
+        isDetached = true
       } else {
         sessions = qel.session :: sessions
         scheduleActor(f, qel.msg)
@@ -377,7 +378,8 @@ trait Actor extends OutputChannel[Any] {
         waitingFor = f.isDefinedAt
         TimerThread.requestTimeout(this, f, msec)
         timeoutPending = true
-        detachActor(f)
+        continuation = f
+        isDetached = true
       } else {
         sessions = qel.session :: sessions
         scheduleActor(f, qel.msg)
@@ -460,12 +462,6 @@ trait Actor extends OutputChannel[Any] {
   private[actors] def tick(): Unit =
     Scheduler tick this
 
-  private[actors] def detachActor(f: PartialFunction[Any, Unit]) {
-    continuation = f
-    isDetached = true
-    throw new SuspendActorException
-  }
-
   private[actors] var kill = () => {}
 
   private class ExitSuspendLoop extends Throwable
-- 
cgit v1.2.3