Merge pull request #27257 from hepin1989/nullMsg

Add sender to the exception message when the message sent is null.
This commit is contained in:
Patrik Nordwall 2019-07-05 08:27:14 +02:00 committed by GitHub
commit ff76211f4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,7 +26,12 @@ final case class Envelope private (val message: Any, val sender: ActorRef)
object Envelope {
def apply(message: Any, sender: ActorRef, system: ActorSystem): Envelope = {
if (message == null) throw InvalidMessageException("Message is null")
if (message == null) {
if (sender eq Actor.noSender)
throw InvalidMessageException(s"Message is null.")
else
throw InvalidMessageException(s"Message sent from [$sender] is null.")
}
new Envelope(message, if (sender ne Actor.noSender) sender else system.deadLetters)
}
}