From f336b24830af1d5772979262315cf3ea1f06cec5 Mon Sep 17 00:00:00 2001
From: Brendan Lawlor <brendan@sanuasoft.com>
Date: Wed, 20 Aug 2014 09:34:36 +0200
Subject: [PATCH] =per #15671 fix local snapshot store picking up wrong file.

Added spec test to cover fix for bug 15671

Replaced deprecated NamedProcessor with NamedPersistentActor. Cleaned up unused message handling. Typos and misspellings.
---
 .../snapshot/local/LocalSnapshotStore.scala   |  6 +-
 .../SnapshotRecoveryLocalStoreSpec.scala      | 66 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala

diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
index 40a41c20e5..60ed990d41 100644
--- a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
+++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala
@@ -120,6 +120,10 @@ private[persistence] class LocalSnapshotStore extends SnapshotStore with ActorLo
   }
 
   private class SnapshotFilenameFilter(persistenceId: String) extends FilenameFilter {
-    def accept(dir: File, name: String): Boolean = name.startsWith(s"snapshot-${URLEncoder.encode(persistenceId, "UTF-8")}")
+    def accept(dir: File, name: String): Boolean =
+      name match {
+        case FilenamePattern(pid, snr, tms) ⇒ pid.equals(URLEncoder.encode(persistenceId))
+        case _                              ⇒ false
+      }
   }
 }
diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala
new file mode 100644
index 0000000000..2536b3b38e
--- /dev/null
+++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryLocalStoreSpec.scala
@@ -0,0 +1,66 @@
+package akka.persistence
+
+import akka.actor.{ Props, Actor, ActorRef }
+import akka.testkit.{ TestProbe, ImplicitSender, AkkaSpec }
+
+object SnapshotRecoveryLocalStoreSpec {
+  val persistenceId = "europe"
+  val extendedName = persistenceId + "italy"
+
+  case object TakeSnapshot
+
+  class SaveSnapshotTestPersistentActor(name: String, probe: ActorRef) extends NamedPersistentActor(name) {
+    var state = s"State for actor ${name}"
+    def receiveCommand = {
+      case TakeSnapshot            ⇒ saveSnapshot(state)
+      case SaveSnapshotSuccess(md) ⇒ probe ! md.sequenceNr
+      case GetState                ⇒ probe ! state
+    }
+    def receiveRecover = {
+      case _ ⇒
+    }
+  }
+
+  class LoadSnapshotTestPersistentActor(name: String, probe: ActorRef) extends NamedPersistentActor(name) {
+    def receiveCommand = {
+      case _ ⇒
+    }
+    def receiveRecover = {
+      case SnapshotOffer(md, s) ⇒ probe ! ((md, s))
+      case other                ⇒ probe ! other
+    }
+    override def preStart() = ()
+  }
+}
+
+class SnapshotRecoveryLocalStoreSpec extends AkkaSpec(PersistenceSpec.config("inmem", "SnapshotRecoveryLocalStoreSpec")) with PersistenceSpec with ImplicitSender {
+
+  import SnapshotRecoveryLocalStoreSpec._
+
+  override protected def beforeEach() {
+    super.beforeEach()
+
+    val persistentActor1 = system.actorOf(Props(classOf[SaveSnapshotTestPersistentActor], persistenceId, testActor))
+    val persistentActor2 = system.actorOf(Props(classOf[SaveSnapshotTestPersistentActor], extendedName, testActor))
+    persistentActor1 ! TakeSnapshot
+    persistentActor2 ! TakeSnapshot
+    expectMsgAllOf(0L, 0L)
+
+  }
+
+  "A persistent actor which is persisted at the same time as another actor whose persistenceId is an extension of the first " must {
+    "recover state only from its own correct snapshot file" in {
+
+      val recoveringActor = system.actorOf(Props(classOf[LoadSnapshotTestPersistentActor], persistenceId, testActor))
+
+      recoveringActor ! Recover()
+
+      expectMsgPF() {
+        case (SnapshotMetadata(pid, seqNo, timestamp), state) ⇒
+          pid should be(persistenceId)
+      }
+      expectMsg(RecoveryCompleted)
+    }
+
+  }
+}
\ No newline at end of file