SyncVar enhancements:

* deprecation of "exception" field
* addition of blocking-queue-like "take", "put" methods
* change of "unset" signature

1 files changed, 18 insertions, 1 deletions

diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala
index 6b9ca33395..c04268990a 100644
--- a/src/library/scala/concurrent/SyncVar.scala
+++ b/src/library/scala/concurrent/SyncVar.scala
@@ -28,6 +28,14 @@ class SyncVar[A] {
     else throw exception.get
   }
 
+  def take() = synchronized {
+    try {
+      get
+    } finally {
+      unset()
+    }
+  }
+
   def set(x: A) = synchronized {
     value = x
     isDefined = true
@@ -41,6 +49,9 @@ class SyncVar[A] {
     notifyAll()
   }
 
+  /**
+   *  @deprecated Will be removed in 2.8. SyncVar should not allow exception by design.
+   */
   def setWithCatch(x: => A) = synchronized {
     try {
       this set x
@@ -51,12 +62,18 @@ class SyncVar[A] {
     }
   }
 
+  def put(x: A) = synchronized {
+    while (isDefined) wait()
+    set(x)
+  }
+
   def isSet: Boolean = synchronized {
     isDefined
   }
 
-  def unset = synchronized {
+  def unset(): Unit = synchronized {
     isDefined = false
+    notifyAll()
   }
 
 }