Merge pull request confluentinc#190 from confluentinc/deserialize-nulls

ewencp · web-flow · commit eb8cf618c10e · 2017-05-14T12:14:28.000-07:00
Handle null/None values during deserialization
diff --git a/confluent_kafka/avro/serializer/message_serializer.py b/confluent_kafka/avro/serializer/message_serializer.py
@@ -201,6 +201,10 @@ def decode_message(self, message):
         the schema registry.
         @:param: message
         """
+
+        if message is None:
+            return None
+
         if len(message) <= 5:
             raise SerializerError("message is too small to decode")
 
diff --git a/tests/avro/test_message_serializer.py b/tests/avro/test_message_serializer.py
@@ -75,5 +75,10 @@ def test_encode_record_with_schema(self):
             message = self.ms.encode_record_with_schema(topic, basic, record)
             self.assertMessageIsSame(message, record, schema_id)
 
+    def test_decode_none(self):
+        """"null/None messages should decode to None"""
+
+        self.assertIsNone(self.ms.decode_message(None))
+
     def hash_func(self):
         return hash(str(self))
