diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-26 10:46:03 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-26 10:46:03 +0100 |
| commit | 619e8ecd0c123602c20eb3a4ce45bdefb79d5900 (patch) | |
| tree | b522d67dc21d11f496cd52d6a86c2851af718135 /synapse/storage/roommember.py | |
| parent | Fix typing tests (diff) | |
| download | synapse-619e8ecd0c123602c20eb3a4ce45bdefb79d5900.tar.xz | |
Handle None state group correctly
Diffstat (limited to 'synapse/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 8c4a5f9f2e..0e9e71f600 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -692,7 +692,10 @@ class _JoinedHostsCache(object): host = intern_string(get_domain_from_id(user_id)) self.hosts_to_joined_users.setdefault(host, set()).add(user_id) - self.state_group = state_entry.state_group + if state_entry.state_group: + self.state_group = state_entry.state_group + else: + self.state_group = object() self._len = sum(len(v) for v in self.hosts_to_joined_users.itervalues()) defer.returnValue(frozenset(self.hosts_to_joined_users)) |