From d07df2b917ca70d5eb52ec8cbdffc9a5f7b7e23b Mon Sep 17 00:00:00 2001
From: Konrad `ktoso` Malawski <ktoso@project13.pl>
Date: Mon, 21 Aug 2017 02:02:15 +0900
Subject: [PATCH] =clt #23215 fail with nicer message if PubSubMediator gets
 null message (#23216)

* =clt #23215 fail with nicer message if PubSubMediator gets null message

* Update DistributedPubSubMediator.scala
---
 .../scala/akka/cluster/pubsub/DistributedPubSubMediator.scala    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
index 6410a544a3..fb2f3a6430 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
+++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala
@@ -402,6 +402,7 @@ object DistributedPubSubMediator {
      */
     def wrapIfNeeded: Any ⇒ Any = {
       case msg: RouterEnvelope ⇒ MediatorRouterEnvelope(msg)
+      case null                ⇒ throw InvalidMessageException("Message must not be null")
       case msg: Any            ⇒ msg
     }
   }