raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

uncommented the dataflowstream tests and they all pass

Browse source
This commit is contained in:
Jonas Bonér 2010-11-24 16:36:23 +01:00
parent 8a2087e68e
commit 2b28ba93b6
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-actor/src/main/scala/akka/actor/Implicits.scala
View file

@ -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)
}

4
akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
View file

@ -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") {

5
akka-http/src/main/scala/Mist.scala
View file

@ -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
/**