Replaced ExitActorException with SuspendActorEx...

Replaced ExitActorException with SuspendActorException.

2 files changed, 2 insertions, 22 deletions

diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala
index db1c52ad44..3b07aae124 100644
--- a/src/actors/scala/actors/Actor.scala
+++ b/src/actors/scala/actors/Actor.scala
@@ -977,7 +977,8 @@ trait Actor extends AbstractActor {
     // links
     if (!links.isEmpty)
       exitLinked()
-    throw new ExitActorException
+    terminated()
+    throw new SuspendActorException
   }
 
   // Assume !links.isEmpty
diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala
index 3746abce0b..1955ac3b05 100644
--- a/src/actors/scala/actors/Reaction.scala
+++ b/src/actors/scala/actors/Reaction.scala
@@ -13,23 +13,6 @@ package scala.actors
 
 import java.lang.{InterruptedException, Runnable}
 
-/** <p>
- *    This exception is thrown whenever an actor exits.
- *    Its purpose is to let <code>exit</code> have
- *    return type <code>Nothing</code>.
- *  </p>
- *
- *  @version 0.9.10
- *  @author Philipp Haller
- */
-private[actors] class ExitActorException extends Throwable {
-  /*
-   * For efficiency reasons we do not fill in
-   * the execution stack trace.
-   */
-  override def fillInStackTrace(): Throwable = this
-}
-
 private[actors] class KillActorException extends Throwable {
   /*
    * For efficiency reasons we do not fill in
@@ -83,10 +66,6 @@ class Reaction extends Runnable {
       }
     }
     catch {
-      case eae: ExitActorException => {
-        //Debug.info(a+": exiting...")
-        a.terminated()
-      }
       case _: SuspendActorException => {
         // do nothing (continuation is already saved)
       }