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

Making sure it deserializes too

Browse source
This commit is contained in:
Viktor Klang 2011-12-27 16:36:30 +01:00
parent 5ff8f4e2a4
commit 642b3aae2b
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
View file

@ -16,10 +16,19 @@ import akka.util.ReflectiveAccess
import akka.serialization.SerializationExtension
final case class Envelope(val message: Any, val sender: ActorRef)(system: ActorSystem) {
if (message.isInstanceOf[AnyRef] && (message.asInstanceOf[AnyRef] eq null)) throw new InvalidMessageException("Message is null")
else if (system.settings.SerializeAllMessages) SerializationExtension(system).serialize(message.asInstanceOf[AnyRef]) match {
case Left(t) ⇒ throw t
case Right(_) ⇒ //Just verify that it works to serialize it
if (message.isInstanceOf[AnyRef]) {
val msg = message.asInstanceOf[AnyRef]
if (msg eq null) throw new InvalidMessageException("Message is null")
if (system.settings.SerializeAllMessages) {
val ser = SerializationExtension(system)
ser.serialize(msg) match { //Verify serializability
case Left(t) ⇒ throw t
case Right(bytes) ⇒ ser.deserialize(bytes, msg.getClass, None) match { //Verify deserializability
case Left(t) ⇒ throw t
case _ ⇒ //All good
}
}
}
}
}