Merge branch 'master' into wip-1504-config-comments-patriknw

Conflicts:
	akka-actor/src/main/resources/reference.conf
This commit is contained in:
Patrik Nordwall 2011-12-14 17:02:29 +01:00
commit c1826abee1
88 changed files with 478 additions and 360 deletions

View file

@ -40,7 +40,7 @@ class FirstActor extends Actor {
case DoIt(msg)
val replyMsg = doSomeDangerousWork(msg)
sender ! replyMsg
self.stop()
context.stop(self)
}
def doSomeDangerousWork(msg: ImmutableMessage): String = { "done" }
})) ! m
@ -143,7 +143,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
//#import-context
val first = system.actorOf(Props(new FirstActor))
first.stop()
system.stop(first)
}
@ -169,7 +169,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
system.eventStream.unsubscribe(testActor)
system.eventStream.publish(TestEvent.UnMute(filter))
myActor.stop()
system.stop(myActor)
}
"creating actor with constructor" in {
@ -182,7 +182,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
val myActor = system.actorOf(Props(new MyActor("...")))
//#creating-constructor
myActor.stop()
system.stop(myActor)
}
"creating actor with Props" in {
@ -192,7 +192,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
val myActor = system.actorOf(Props[MyActor].withDispatcher(dispatcher), name = "myactor")
//#creating-props
myActor.stop()
system.stop(myActor)
}
"using ask" in {
@ -214,7 +214,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
val result: Option[Int] = for (x (myActor ? 3).as[Int]) yield { 2 * x }
//#using-ask
myActor.stop()
system.stop(myActor)
}
"using receiveTimeout" in {