Don't crash for clients without a last will

References #74
rabbitmq · Dec 7, 2016 · 9e95a5c · 9e95a5c
1 parent cc2e1df
commit 9e95a5c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/rabbit_mqtt_processor.erl b/src/rabbit_mqtt_processor.erl
@@ -601,12 +601,16 @@ ensure_queue(Qos, #proc_state{ channels      = {Channel, _},
             {Q, PState}
     end.
 
+send_will(PState = #proc_state{will_msg = undefined}) ->
+    PState;
+
 send_will(PState = #proc_state{will_msg = WillMsg = #mqtt_msg{retain = Retain, topic = Topic}, retainer_pid = RPid}) ->
     amqp_pub(WillMsg, PState),
     case Retain of
         false -> ok;
         true  -> hand_off_to_retainer(RPid, Topic, WillMsg)
-    end.
+    end,
+    PState.
 
 amqp_pub(undefined, PState) ->
     PState;