OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Ensure we never return a None event from _get_state_for_groups
pull/232/head
Erik Johnston 2015-08-18 16:30:17 +01:00
parent c3dd2ecd5e a82938416d
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.
state_dict = {key: None for key in types}
state_dict.update(results[group])
results[group] = state_dict
else:
state_dict = results[group]
@ -412,9 +413,11 @@ class StateStore(SQLBaseStore):
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] = {
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)