raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #18395 from akka/wip-fix-persisting-manifest-ktoso

Browse source 
=per #18394 persist EventAdapter manifest in default proto serializer
This commit is contained in:
Konrad Malawski 2015-09-04 11:32:37 +02:00
commit 9bf6b65e72
4 changed files with 47 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala
View file

@ -130,6 +130,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
if (persistent.persistenceId != Undefined) builder.setPersistenceId(persistent.persistenceId)
if (persistent.sender != Actor.noSender) builder.setSender(Serialization.serializedActorPath(persistent.sender))
if (persistent.manifest != PersistentRepr.Undefined) builder.setManifest(persistent.manifest)
builder.setPayload(persistentPayloadBuilder(persistent.payload.asInstanceOf[AnyRef]))
builder.setSequenceNr(persistent.sequenceNr)
@ -146,7 +147,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
serializer match {
case ser2: SerializerWithStringManifest ⇒
val manifest = ser2.manifest(payload)
if (manifest != "")
if (manifest != PersistentRepr.Undefined)
builder.setPayloadManifest(ByteString.copyFromUtf8(manifest))
case _ ⇒
if (serializer.includeManifest)