Add promise implementation. Move fork/join implementation into default package. Factor commonalities of promises and tasks into Completable.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala
index 898344cb66..33953f2fca 100644
--- a/src/library/scala/concurrent/Promise.scala
+++ b/src/library/scala/concurrent/Promise.scala
@@ -44,14 +44,21 @@ trait Promise[T] {
    *  
    *  $promiseCompletion
    */
-  def fail(t: Throwable): Unit
-  
-  /** The timeout for this promise.
+  def break(t: Throwable): Unit
+
+  /** Wraps a `Throwable` in an `ExecutionException` if necessary.
+   *
+   *  $allowedThrowables
    */
-  def timeout: Timeout
+  protected def wrap(t: Throwable): Throwable = t match {
+    case t: Throwable if isFutureThrowable(t) => t
+    case _ => new ExecutionException(t)
+  }
+
 }
 
 
+
 object Promise {
   /*
   /**