Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-06 10:07:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #228 from matrix-org/erikj/_get_state_for_groups

Browse Source 
Ensure we never return a None event from _get_state_for_groups
This commit is contained in:
Erik Johnston 2015-08-18 16:30:17 +01:00
commit e624cdec64
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/storage/state.py
View File

@ -398,6 +398,7 @@ class StateStore(SQLBaseStore):
# for them again. # for them again.
state_dict = {key: None for key in types} state_dict = {key: None for key in types}
state_dict.update(results[group]) state_dict.update(results[group])
results[group] = state_dict
else: else:
state_dict = results[group] state_dict = results[group]
@ -412,9 +413,11 @@ class StateStore(SQLBaseStore):
full=(types is None), full=(types is None),
) )
# We replace here to remove all the entries with None values. # Remove all the entries with None values. The None values were just
# used for bookkeeping in the cache.
for group, state_dict in results.items():
results[group] = { results[group] = {
key: value for key, value in state_dict.items() if value key: event for key, event in state_dict.items() if event
} }
defer.returnValue(results) defer.returnValue(results)