From 13f86c3489dba5a2df06cf635f220c23e36b662a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 23 Feb 2016 15:05:37 +0000
Subject: [PATCH] Handle get_all_entities_changed returning None
---
synapse/handlers/presence.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index ff62d47679..952e48e319 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -858,11 +858,14 @@ class PresenceEventSource(object):
friends.add(user_id) # So that we receive our own presence
user_ids_changed = set()
+ changed = None
if from_key and from_key < 100:
# For small deltas, its quicker to get all changes and then
# work out if we share a room or they're in our presence list
changed = stream_change_cache.get_all_entities_changed(from_key)
+ # get_all_entities_changed can return None
+ if changed is not None:
for other_user_id in changed:
if other_user_id in friends:
user_ids_changed.add(other_user_id)
--
GitLab