Fixed the stupid exception code. Every part of this code which looks

nice is proposed by Tiark. Many thanks!
danielkroeni · Feb 17, 2012 · 134d7d8 · 134d7d8
1 parent 11b9549
commit 134d7d8
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/main/scala/async/Async.scala b/src/main/scala/async/Async.scala
@@ -37,17 +37,9 @@ object Async {
 
   def await[A](block: => Future[A]): A@suspendable = {
     val ec = localContext get()
-    val ex = new AtomicReference[Throwable] // holds the exception if any
-    val a = shift[A,Unit,Unit] { cont: (A => Unit) =>
-      block onComplete { 
-        case Right(r) => ec.execute(cont(r))
-        case Left(e) => 
-          ex.set(e) // store exception
-          ec.execute(cont(null.asInstanceOf[A])) //TODO solve appropriately
-      }
+    val a = shift[Either[Throwable,A],Unit,Unit] { cont: (Either[Throwable,A] => Unit) =>
+      block onComplete { r => ec.execute(cont(r)) }
     }
-    // rethrow exception if any
-    if(ex.get() != null) throw ex.get()
-    a
+    a.fold(throw _, x => x)
   }
 }