summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2007-06-12 17:13:20 +0000
committerPhilipp Haller <hallerp@gmail.com>2007-06-12 17:13:20 +0000
commit02075a24e37ce8f1cad9af33c2b9b12810ceb598 (patch)
tree9a7727150909a884b8e9bcd6d131571fcf79ebde
parentd58502d5d8e51fb0af0cd1424b1eb8f343e79429 (diff)
downloadscala-02075a24e37ce8f1cad9af33c2b9b12810ceb598.tar.gz
scala-02075a24e37ce8f1cad9af33c2b9b12810ceb598.tar.bz2
scala-02075a24e37ce8f1cad9af33c2b9b12810ceb598.zip
Removed a race condition in RemoteActor.
-rw-r--r--src/actors/scala/actors/remote/RemoteActor.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala
index b30e363b46..19d85df491 100644
--- a/src/actors/scala/actors/remote/RemoteActor.scala
+++ b/src/actors/scala/actors/remote/RemoteActor.scala
@@ -48,7 +48,7 @@ object RemoteActor {
* Makes <code>self</code> remotely accessible on TCP port
* <code>port</code>.
*/
- def alive(port: int) {
+ def alive(port: int): unit = synchronized {
val serv = new TcpService(port)
serv.start()
kernels += Actor.self -> serv.kernel
@@ -58,7 +58,7 @@ object RemoteActor {
* Registers <code>a</code> under <code>name</code> on this
* node.
*/
- def register(name: Symbol, a: Actor) {
+ def register(name: Symbol, a: Actor): unit = synchronized {
val kernel = kernels.get(Actor.self) match {
case None =>
val serv = new TcpService(TcpService.generatePort)