From d98c4db1f981fcfa05be733503b9c17276da5cca Mon Sep 17 00:00:00 2001 From: Roland Date: Tue, 6 Nov 2012 14:15:57 +0100 Subject: [PATCH] fix up two oversights in previous doc change - use discardOld=false also in Scala stash sample code - correct link to UnnestedReceives sample --- akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala | 2 +- akka-docs/rst/scala/actors.rst | 2 +- akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala index 097912601a..2aba0e18d4 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala @@ -113,7 +113,7 @@ class ActorDSLSpec extends AkkaSpec { case "info" ⇒ sender ! "B" case "switch" ⇒ unbecome() // return to the "A" behavior } - case "lobotomize" => unbecome() // OH NOES: Actor.emptyBehavior + case "lobotomize" ⇒ unbecome() // OH NOES: Actor.emptyBehavior } }) //#becomeStacked diff --git a/akka-docs/rst/scala/actors.rst b/akka-docs/rst/scala/actors.rst index 85f5c7ae8e..e52d9ba973 100644 --- a/akka-docs/rst/scala/actors.rst +++ b/akka-docs/rst/scala/actors.rst @@ -696,7 +696,7 @@ behavior is not the default). Encoding Scala Actors nested receives without accidentally leaking memory ------------------------------------------------------------------------- -See this `Unnested receive example <@github@/akka-docs/scala/code/docs/actor/UnnestedReceives.scala>`_. +See this `Unnested receive example <@github@/akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala>`_. Stash diff --git a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala index 6642df3b28..fc936ff13b 100644 --- a/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala @@ -316,13 +316,13 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) { def receive = { case "open" ⇒ unstashAll() - context.become { + context.become({ case "write" ⇒ // do writing... case "close" ⇒ unstashAll() context.unbecome() case msg ⇒ stash() - } + }, discardOld = false) // stack on top instead of replacing case msg ⇒ stash() } }