Merge branch 'execution-context' of https://github.com/phaller/scala into execution-context

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

1 files changed, 12 insertions, 2 deletions

diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala
index b244d8c5e0..fb80eb8f31 100644
--- a/src/library/scala/concurrent/Promise.scala
+++ b/src/library/scala/concurrent/Promise.scala
@@ -48,11 +48,21 @@ trait Promise[T] {
    *  
    *  $promiseCompletion
    */
-  def fail(t: Throwable): Unit
-  
+  def break(t: Throwable): Unit
+
+  /** Wraps a `Throwable` in an `ExecutionException` if necessary.
+   *
+   *  $allowedThrowables
+   */
+  protected def wrap(t: Throwable): Throwable = t match {
+    case t: Throwable if isFutureThrowable(t) => t
+    case _ => new ExecutionException(t)
+  }
+
 }
 
 
+
 object Promise {
   /*
   /**