Merge branch 'work'

Conflicts:
	src/library/scala/concurrent/SyncVar.scala

1 files changed, 32 insertions, 8 deletions

diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala
index 61f8188ab1..bf39fef27c 100644
--- a/src/library/scala/concurrent/SyncVar.scala
+++ b/src/library/scala/concurrent/SyncVar.scala
@@ -36,16 +36,40 @@ class SyncVar[A] {
      *  by counting time elapsed directly.  Loop required
      *  to deal with spurious wakeups.
      */
-  	var rest = timeout
-  	while (!isDefined && rest >= 0) {
-  	  val elapsed = waitMeasuringElapsed(timeout)
-  	  if (!isDefined && elapsed > 0)
-  	    rest -= elapsed
-  	}
-  	if (isDefined) Some(value)
-  	else None
+    var rest = timeout
+    while (!isDefined && rest >= 0) {
+      val elapsed = waitMeasuringElapsed(timeout)
+      if (!isDefined && elapsed > 0)
+  	rest -= elapsed
+    }
+    if (isDefined) Some(value)
+    else None
   }
 
+  // /** Waits for this SyncVar to become defined at least for
+  //  *  `timeout` milliseconds (possibly more), and gets its
+  //  *  value.
+  //  *
+  //  *  @param timeout     the amount of milliseconds to wait
+  //  *  @return            `None` if variable is undefined after `timeout`, `Some(value)` otherwise
+  //  */
+  // def get(timeout: Long): Option[A] = synchronized {
+  //   if (timeout == 0L) Some(get)
+  //   else {
+  //     val start = System.currentTimeMillis
+  //     var left = timeout
+  //     while (!isDefined && left > 0) {
+  //       wait(left)
+  //       if (!isDefined) {
+  //         val elapsed = System.currentTimeMillis - start
+  //         left = timeout - elapsed
+  //       }
+  //     }
+  //     if (isDefined) Some(value)
+  //     else None
+  //   }
+  // }
+
   def take() = synchronized {
     try get
     finally unset()