From b1936ece49dce43754892a8e5ed81d243ad7e135 Mon Sep 17 00:00:00 2001
From: Philipp Haller receive
, react
, reply
,
* etc.
*
- * @version 0.9.4
+ * @version 0.9.5
* @author Philipp Haller
*/
object Actor {
@@ -256,7 +256,7 @@ object Actor {
* Philipp Haller and Martin Odersky, LAMP-REPORT-2007-001, EPFL
*
ActorProxy
provides a dynamic actor proxy for normal
* Java threads.
*
- * @version 0.9.4
+ * @version 0.9.5
* @author Philipp Haller
*/
private[actors] class ActorProxy(t: Thread) extends Actor {
@@ -26,31 +26,13 @@ private[actors] class ActorProxy(t: Thread) extends Actor {
def act() {}
/**
- *
- * Terminates execution of self
with the following
- * effect on linked actors:
- *
- * For each linked actor a
with
- * trapExit
set to true
, send message
- * Exit(self, reason)
to a
.
- *
- * For each linked actor a
with
- * trapExit
set to false
(default),
- * call a.exit(reason)
if
- * reason != 'normal
.
- *
'normal
.
*/
- override def exit(reason: AnyRef): Nothing = {
- kill()
+ override def exit(): Nothing = {
// links
- if (!links.isEmpty) {
- exitReason = reason
+ if (!links.isEmpty)
exitLinked()
- }
throw new InterruptedException
}
+
}
diff --git a/src/actors/scala/actors/Reaction.scala b/src/actors/scala/actors/Reaction.scala
index 4d282880a5..e53c054081 100644
--- a/src/actors/scala/actors/Reaction.scala
+++ b/src/actors/scala/actors/Reaction.scala
@@ -19,7 +19,7 @@ import java.lang.{InterruptedException, Runnable}
* return type Nothing
.
*
*
- * @version 0.9.4
+ * @version 0.9.5
* @author Philipp Haller
*/
private[actors] class ExitActorException extends Throwable
@@ -29,7 +29,7 @@ private[actors] class ExitActorException extends Throwable
* an instance of an Actor
with a
* java.lang.Runnable
.
*
- * @version 0.9.4
+ * @version 0.9.5
* @author Philipp Haller
*/
private[actors] class Reaction(a: Actor,
--
cgit v1.2.3