diff options
author | Paul Phillips <paulp@improving.org> | 2010-08-30 08:03:07 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-08-30 08:03:07 +0000 |
commit | c0b806f709d72cd3fa3bfdb5d745cc36a4a3b6cd (patch) | |
tree | 827aa878f64dc256a2ff411d46e423b33d4bb149 /src/library | |
parent | 501a7c1bb6955577ec90aac5daf87a03eb61a5f3 (diff) | |
download | scala-c0b806f709d72cd3fa3bfdb5d745cc36a4a3b6cd.tar.gz scala-c0b806f709d72cd3fa3bfdb5d745cc36a4a3b6cd.tar.bz2 scala-c0b806f709d72cd3fa3bfdb5d745cc36a4a3b6cd.zip |
Dredged some more dead code out of SyncVar.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/concurrent/SyncVar.scala | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/library/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala index 5b55be1326..abe40e823e 100644 --- a/src/library/scala/concurrent/SyncVar.scala +++ b/src/library/scala/concurrent/SyncVar.scala @@ -17,12 +17,10 @@ package scala.concurrent class SyncVar[A] { private var isDefined: Boolean = false private var value: A = _ - private var exception: Option[Throwable] = None def get = synchronized { while (!isDefined) wait() - if (exception.isEmpty) value - else throw exception.get + value } def get(timeout: Long): Option[A] = synchronized { @@ -30,8 +28,7 @@ class SyncVar[A] { try wait(timeout) catch { case _: InterruptedException => () } } - if (exception.isDefined) throw exception.get - else if (isDefined) Some(value) + if (isDefined) Some(value) else None } @@ -43,7 +40,6 @@ class SyncVar[A] { def set(x: A) = synchronized { value = x isDefined = true - exception = None notifyAll() } |