diff options
| author | Erik Johnston <erik@matrix.org> | 2018-11-02 10:29:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-11-02 10:29:19 +0000 |
| commit | 54aec35867d24bafa870e5b437a11b9a0c502658 (patch) | |
| tree | cdb59953e1c9a6c06df12bd32c4965ce98c21d6e /synapse/state | |
| parent | Merge pull request #4128 from matrix-org/erikj/state_res_v2_version (diff) | |
| download | synapse-54aec35867d24bafa870e5b437a11b9a0c502658.tar.xz | |
Fix None exception in state res v2
Diffstat (limited to 'synapse/state')
| -rw-r--r-- | synapse/state/v2.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/state/v2.py b/synapse/state/v2.py index 5d06f7e928..dbc9688c56 100644 --- a/synapse/state/v2.py +++ b/synapse/state/v2.py @@ -53,6 +53,10 @@ def resolve_events_with_store(state_sets, event_map, state_res_store): logger.debug("Computing conflicted state") + # We use event_map as a cache, so if its None we need to initialize it + if event_map is None: + event_map = {} + # First split up the un/conflicted state unconflicted_state, conflicted_state = _seperate(state_sets) |