From a11d2b6b3a52c18bfb33d3a23cfabe505dde6709 Mon Sep 17 00:00:00 2001 From: hepin1989 Date: Wed, 3 Jul 2019 19:46:04 +0800 Subject: [PATCH] Add sender to the exception message when the message sent is null. --- .../src/main/scala/akka/dispatch/AbstractDispatcher.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala index 6a2c34657b..be68266a9a 100644 --- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala @@ -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) } }