Porting akka future tests.

Fixed a bug in Future.zip.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index def086bc03..55c91619fa 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -384,18 +384,18 @@ trait Future[+T] extends Awaitable[T] {
    */
   def zip[U](that: Future[U]): Future[(T, U)] = {
     val p = newPromise[(T, U)]
-
+    
     this onComplete {
       case Left(t)  => p failure t
-      case Right(r) => that onSuccess {
-        case r2 => p success ((r, r2))
-      }
-    }
-
-    that onFailure {
-      case f => p failure f
+      case Right(r) =>
+        that onSuccess {
+          case r2 => p success ((r, r2))
+        }
+        that onFailure {
+          case f => p failure f
+        }
     }
-
+    
     p.future
   }