From: Roger Light <roger@atchoo.org>
Date: Sat, 22 Jun 2013 21:40:00 +0000 (+0100)
Subject: Handle will_payload==None.
X-Git-Tag: v0.9~61
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f4b6f8cf43f5877a6aa1379e20ced2b6beaa51fb;p=packages%2Fp%2Fpaho-mqtt.git

Handle will_payload==None.
---

diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
index 60644b4..7d329be 100755
--- a/src/paho/mqtt/client.py
+++ b/src/paho/mqtt/client.py
@@ -1431,10 +1431,10 @@ class Client:
 
         if self._will:
             self._pack_str16(packet, self._will_topic)
-            if len(self._will_payload) > 0:
-                self._pack_str16(packet, self._will_payload)
-            else:
+            if self._will_payload == None or len(self._will_payload) == 0:
                 packet.extend(struct.pack("!H", 0))
+            else:
+                self._pack_str16(packet, self._will_payload)
 
         if self._username:
             self._pack_str16(packet, self._username)