From 1f63ebf911a67fd3addeaea4e09c506afe2c7d12 Mon Sep 17 00:00:00 2001 From: Konrad `ktoso` Malawski Date: Mon, 29 May 2017 16:04:43 +0200 Subject: [PATCH] =per #23042 Recover.none should immediately carry None snapshot crit (#23043) * =per #23042 Recover.none should immediately carry None snapshot crit * Update migration-guide-2.4.x-2.5.x.md --- .../src/main/scala/akka/persistence/PersistentActor.scala | 2 +- .../akka/persistence/SnapshotRecoveryLocalStoreSpec.scala | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala index c2784dbfd5..1059e91cc8 100644 --- a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala +++ b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala @@ -100,7 +100,7 @@ object Recovery { * Convenience method for skipping recovery in [[PersistentActor]]. * @see [[Recovery]] */ - val none: Recovery = Recovery(toSequenceNr = 0L) + val none: Recovery = Recovery(toSequenceNr = 0L, fromSnapshot = SnapshotSelectionCriteria.None) } final class RecoveryTimedOut(message: String) extends RuntimeException(message) with NoStackTrace diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala index bae79abb39..6db9856cab 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala @@ -22,9 +22,10 @@ object SnapshotRecoveryLocalStoreSpec { } class LoadSnapshotTestPersistentActor(name: String, probe: ActorRef) extends NamedPersistentActor(name) - with TurnOffRecoverOnStart with ActorLogging { + override def recovery = Recovery(toSequenceNr = 0) + def receiveCommand = { case _ ⇒ } @@ -58,4 +59,4 @@ class SnapshotRecoveryLocalStoreSpec extends PersistenceSpec(PersistenceSpec.con } } -} \ No newline at end of file +}