From 2bf81a0e15c9db75434fedb1e73ec9978f486250 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 29 Apr 2014 08:29:41 +0200 Subject: [PATCH] =act #13966 Change wrong default discardOld in UntypedActor become (cherry picked from commit 2aada3b5a857552f9d7854a19cd72d77e6a52b9b) --- akka-actor/src/main/scala/akka/actor/ActorCell.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index c569c4946a..71fe7a41a0 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -74,7 +74,7 @@ trait ActorContext extends ActorRefFactory { * Changes the Actor's behavior to become the new 'Receive' (PartialFunction[Any, Unit]) handler. * Replaces the current behavior on the top of the behavior stack. */ - def become(behavior: Actor.Receive): Unit = become(behavior, true) + def become(behavior: Actor.Receive): Unit = become(behavior, discardOld = true) /** * Changes the Actor's behavior to become the new 'Receive' (PartialFunction[Any, Unit]) handler. @@ -528,7 +528,7 @@ private[akka] class ActorCell( def become(behavior: Actor.Receive, discardOld: Boolean = true): Unit = behaviorStack = behavior :: (if (discardOld && behaviorStack.nonEmpty) behaviorStack.tail else behaviorStack) - def become(behavior: Procedure[Any]): Unit = become(behavior, false) + def become(behavior: Procedure[Any]): Unit = become(behavior, discardOld = true) def become(behavior: Procedure[Any], discardOld: Boolean): Unit = become({ case msg ⇒ behavior.apply(msg) }: Actor.Receive, discardOld)