From e0af113f1763789e69a720fb6eb75df48a087bae Mon Sep 17 00:00:00 2001 From: Leonid Bakaleynik Date: Wed, 20 Apr 2016 16:22:18 +0300 Subject: [PATCH] =?UTF-8?q?=3Dper=20#19688=20[2.4.1][PersistentFSM]=20gett?= =?UTF-8?q?ing=20StateTimeout=20for=20state=20wit=E2=80=A6=20(#20266)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * =per #19688 [2.4.1][PersistentFSM] getting StateTimeout for state without timeout after restart * Added deprecation warning --- .../scala/akka/persistence/fsm/PersistentFSMBase.scala | 10 +++++----- .../persistence/fsm/AbstractPersistentFSMTest.java | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala index 72734be987..ad30835e5e 100644 --- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala +++ b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala @@ -301,15 +301,15 @@ trait PersistentFSMBase[S, D, E] extends Actor with Listeners with ActorLogging handleEvent = stateFunction orElse handleEventDefault /** - * Verify existence of initial state and setup timers. This should be the - * last call within the constructor, or [[akka.actor.Actor#preStart]] and - * [[akka.actor.Actor#postRestart]]. + * Verify existence of initial state and setup timers. Used in [[akka.persistence.fsm.PersistentFSM]] + * on recovery. * * An initial `currentState -> currentState` notification will be triggered by calling this method. * - * @see [[#startWith]] + * @see [[akka.persistence.fsm.PersistentFSM#receiveRecover]] */ - final def initialize(): Unit = + @deprecated("Removed from API, called internally", "2.4.5") + private[akka] final def initialize(): Unit = if (currentState != null) makeTransition(currentState) else throw new IllegalStateException("You must call `startWith` before calling `initialize`") diff --git a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java index aa83e528ff..bac149393d 100644 --- a/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java +++ b/akka-persistence/src/test/java/akka/persistence/fsm/AbstractPersistentFSMTest.java @@ -568,8 +568,6 @@ public class AbstractPersistentFSMTest extends JUnitSuite { matchEvent(Leave.class, (event, data) -> stop()) .event(GetCurrentCart.class, (event, data) -> stay().replying(data)) ); - - initialize(); //#customer-fsm-body }