]> git.michaelhowe.org Git - packages/p/paho-mqtt.git/commitdiff
Handle will_payload==None.
authorRoger Light <roger@atchoo.org>
Sat, 22 Jun 2013 21:40:00 +0000 (22:40 +0100)
committerRoger Light <roger@atchoo.org>
Mon, 3 Feb 2014 21:17:08 +0000 (21:17 +0000)
src/paho/mqtt/client.py

index 60644b49878cbab3e0cef8080c0e5bd4a367cdf7..7d329be7aca0f05292e7181b27a786db7e85ca3b 100755 (executable)
@@ -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)