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

Merge branch 'master' into wip-1377-context-patriknw

Browse source 
Conflicts:
	akka-actor/src/main/scala/akka/actor/ActorCell.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
	akka-actor/src/main/scala/akka/event/EventStream.scala
	akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
	akka-tutorials/akka-tutorial-first/src/main/scala/Pi.scala
This commit is contained in:
Patrik Nordwall 2011-12-07 07:49:34 +01:00
commit bfa14a692c
76 changed files with 1908 additions and 963 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
View file

@ -174,8 +174,7 @@ class TestActorRefSpec extends AkkaSpec with BeforeAndAfterEach with DefaultTime
counter = 2
val boss = TestActorRef(Props(new TActor {
val impl = system.asInstanceOf[ActorSystemImpl]
val ref = new TestActorRef(impl, impl.dispatcherFactory.prerequisites, Props(new TActor {
val ref = TestActorRef(Props(new TActor {
def receiveT = { case _ ⇒ }
override def preRestart(reason: Throwable, msg: Option[Any]) { counter -= 1 }
override def postRestart(reason: Throwable) { counter -= 1 }