!per Additional deprecations and cleanup

(cherry picked from commit 98619647e372121fb3c2072a0eab20de4148f7d9)

Conflicts:
	akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala
	akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala
This commit is contained in:
Patrik Nordwall 2014-06-27 09:44:21 +02:00
parent 33027999da
commit f6aa491ef0
13 changed files with 104 additions and 98 deletions

View file

@ -39,15 +39,15 @@ trait SnapshotStore extends Actor {
} to (self, p)
case evt @ SaveSnapshotSuccess(metadata)
saved(metadata)
sender() ! evt // sender is processor
sender() ! evt // sender is persistentActor
case evt @ SaveSnapshotFailure(metadata, _)
delete(metadata)
sender() ! evt // sender is processor
sender() ! evt // sender is persistentActor
case d @ DeleteSnapshot(metadata)
delete(metadata)
if (publish) context.system.eventStream.publish(d)
case d @ DeleteSnapshots(processorId, criteria)
delete(processorId, criteria)
case d @ DeleteSnapshots(persistenceId, criteria)
delete(persistenceId, criteria)
if (publish) context.system.eventStream.publish(d)
}
@ -55,7 +55,7 @@ trait SnapshotStore extends Actor {
/**
* Plugin API: asynchronously loads a snapshot.
*
* @param processorId processor id.
* @param persistenceId processor id.
* @param criteria selection criteria for loading.
*/
def loadAsync(persistenceId: String, criteria: SnapshotSelectionCriteria): Future[Option[SelectedSnapshot]]