From 900b90ca572478eb5072d59712fa06e21b099677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Wed, 24 Nov 2010 16:36:23 +0100
Subject: [PATCH] uncommented the dataflowstream tests and they all pass

---
 akka-actor/src/main/scala/akka/actor/Implicits.scala       | 4 +---
 akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala | 4 ++--
 akka-http/src/main/scala/Mist.scala                        | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/actor/Implicits.scala b/akka-actor/src/main/scala/akka/actor/Implicits.scala
index 668d2d8876..a2d6386d97 100644
--- a/akka-actor/src/main/scala/akka/actor/Implicits.scala
+++ b/akka-actor/src/main/scala/akka/actor/Implicits.scala
@@ -16,7 +16,5 @@ package object actor {
   type Uuid = com.eaio.uuid.UUID
   def newUuid(): Uuid = new Uuid()
   def uuidFrom(time: Long, clockSeqAndNode: Long): Uuid = new Uuid(time,clockSeqAndNode)
-  def uuidFrom(uuid: String): Uuid = {
-    new Uuid(uuid)
-  }
+  def uuidFrom(uuid: String): Uuid = new Uuid(uuid)
 }
diff --git a/akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala b/akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
index f787060fc8..8f7b2e8525 100644
--- a/akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
+++ b/akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
@@ -70,7 +70,7 @@ class DataFlowTest extends Spec with ShouldMatchers with BeforeAndAfterAll {
         List(x,y,z).foreach(_.shutdown)
       }
 
-     /*it("should be able to join streams") {
+    it("should be able to join streams") {
       import DataFlow._
       ActorRegistry.shutdownAll
 
@@ -133,7 +133,7 @@ class DataFlowTest extends Spec with ShouldMatchers with BeforeAndAfterAll {
       thread { recurseSum(consumer) }
 
       latch.await(15,TimeUnit.SECONDS) should equal (true)
-    }*/
+    }
 
   /* Test not ready for prime time, causes some sort of deadlock */
   /*  it("should be able to conditionally set variables") {
diff --git a/akka-http/src/main/scala/Mist.scala b/akka-http/src/main/scala/Mist.scala
index f37beb6437..8009293ac7 100644
--- a/akka-http/src/main/scala/Mist.scala
+++ b/akka-http/src/main/scala/Mist.scala
@@ -5,9 +5,10 @@
 package akka.http
 
 import akka.util.Logging
-import javax.servlet.http.HttpServlet
-import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import akka.actor.{ActorRegistry, ActorRef, Actor}
+
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import javax.servlet.http.HttpServlet
 import javax.servlet.Filter
 
 /**