diff options
author | Philipp Haller <hallerp@gmail.com> | 2006-10-31 13:06:44 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2006-10-31 13:06:44 +0000 |
commit | 6c9163849ce73e252bd0574c0fbc29a8ad3bd6ba (patch) | |
tree | 62045af66508c2325e195253c7857f5774314800 /src/actors | |
parent | 1ccd9b6ceddd2b234256eb6a549b7cb056cc5147 (diff) | |
download | scala-6c9163849ce73e252bd0574c0fbc29a8ad3bd6ba.tar.gz scala-6c9163849ce73e252bd0574c0fbc29a8ad3bd6ba.tar.bz2 scala-6c9163849ce73e252bd0574c0fbc29a8ad3bd6ba.zip |
Removed some commented code.
Diffstat (limited to 'src/actors')
-rw-r--r-- | src/actors/scala/actors/Channel.scala | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/actors/scala/actors/Channel.scala b/src/actors/scala/actors/Channel.scala index 74a5b88916..cfabfe921e 100644 --- a/src/actors/scala/actors/Channel.scala +++ b/src/actors/scala/actors/Channel.scala @@ -64,8 +64,6 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { TimerThread.trashRequest(receiver) } - // TODO: transmit call to protocol - if (isSuspended) receiver.resumeActor() else @@ -114,7 +112,6 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { */ def receive[R](f: PartialFunction[Msg, R]): R = { assert(Actor.self == receiver, "receive from channel belonging to other actor") - //assert(receiver.isThreaded, "receive invoked from reactor") receiver.synchronized { receiver.tick() waitingFor = f.isDefinedAt @@ -136,7 +133,6 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { }) match { case Some(Pair(msg, sender)) => { received = msg - // TODO: call to delivery protocol action receiver.pushSender(sender) } case None => { @@ -153,14 +149,12 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { } receiver.resetActor() val result = f(received) - // TODO: call to complete protocol action receiver.popSender() result } private[actors] def receiveFrom[R](r: Actor)(f: PartialFunction[Msg, R]): R = { assert(Actor.self == receiver, "receive from channel belonging to other actor") - //assert(receiver.isThreaded, "receive invoked from reactor") receiver.synchronized { receiver.tick() waitingFor = f.isDefinedAt @@ -213,7 +207,6 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { */ def receiveWithin[R](msec: long)(f: PartialFunction[Any, R]): R = { assert(Actor.self == receiver, "receive from channel belonging to other actor") - //assert(receiver.isThreaded, "receive invoked from reactor") receiver.synchronized { receiver.tick() waitingFor = f.isDefinedAt @@ -300,7 +293,6 @@ class Channel[Msg] extends InputChannel[Msg] with OutputChannel[Msg] { received = msg receiver.pushSender(sender) waitingFor = waitingForNone - // TODO: call to delivery protocol action receiver.scheduleActor(f, received) } case None => { |