Turned TIMEOUT into a case object.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/library/scala/concurrent/MailBox.scala b/src/library/scala/concurrent/MailBox.scala
index 4463071f2e..4162d34fc3 100644
--- a/src/library/scala/concurrent/MailBox.scala
+++ b/src/library/scala/concurrent/MailBox.scala
@@ -25,13 +25,13 @@ class MailBox extends AnyRef with ListQueueCreator {
     def isDefinedAt(msg: Message) = receiver.isDefinedAt(msg);
 
     def receive(): a = synchronized {
-      if (msg == null) wait();
+      while (msg == null) wait();
       receiver(msg)
     }
 
     def receiveWithin(msec: long): a = synchronized {
       if (msg == null) wait(msec);
-      receiver(if (msg != null) msg else TIMEOUT())
+      receiver(if (msg != null) msg else TIMEOUT)
     }
   }
 
diff --git a/src/library/scala/concurrent/TIMEOUT.scala b/src/library/scala/concurrent/TIMEOUT.scala
index d665fdf649..681fc9a66b 100644
--- a/src/library/scala/concurrent/TIMEOUT.scala
+++ b/src/library/scala/concurrent/TIMEOUT.scala
@@ -9,4 +9,4 @@
 
 package scala.concurrent;
 
-case class TIMEOUT();
+case object TIMEOUT;