From 66d6e2fe4380d6f59a2352f801c92c7140a6eca0 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 19 Nov 2013 10:48:05 -0500 Subject: [PATCH] Add more verification when deserializing json changes field on activity stream --- awx/api/serializers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 5e1083c240..ed5b2ab1fe 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -979,7 +979,12 @@ class ActivityStreamSerializer(BaseSerializer): def get_changes(self, obj): if obj is None: return {} - return json.loads(obj.changes) + try: + d_changes = json.loads(obj.changes) + return d_changes + except Exception, e: + logger.warn("Error deserializing activity stream json changes") + return {} def get_related(self, obj): if obj is None: