Fix issues with exception handling in futures. Review by @heathermiller

1 files changed, 6 insertions, 2 deletions

diff --git a/src/library/scala/concurrent/impl/Future.scala b/src/library/scala/concurrent/impl/Future.scala
index 1cc9e95463..9743c37403 100644
--- a/src/library/scala/concurrent/impl/Future.scala
+++ b/src/library/scala/concurrent/impl/Future.scala
@@ -71,14 +71,18 @@ object Future {
   
   def apply[T](body: =>T)(implicit executor: ExecutionContext): Future[T] = {
     val promise = new Promise.DefaultPromise[T]()
+
+    //TODO: shouldn't the following be:
+    //dispatchFuture(executor, () => { promise complete Right(body) })
+
     executor.execute(new Runnable {
       def run = {
         promise complete {
           try {
             Right(body)
           } catch {
-            case NonFatal(e) =>
-              executor.reportFailure(e)
+            case e =>
+              //executor.reportFailure(e)
               scala.concurrent.resolver(e)
           }
         }