diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-20 11:52:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-20 11:52:51 +0000 |
| commit | 09eb08f910bd4a6077cca6ab4c3068eee55d59f3 (patch) | |
| tree | bb64cb5e394bdb361ac9f64216b48d9beb836e43 /synapse/state.py | |
| parent | Make worker listener config backwards compat (diff) | |
| download | synapse-09eb08f910bd4a6077cca6ab4c3068eee55d59f3.tar.xz | |
Derive current_state_events from state groups
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/state.py b/synapse/state.py index 20aaacf40f..383d32b163 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -429,6 +429,9 @@ def resolve_events(state_sets, state_map_factory): dict[(str, str), synapse.events.FrozenEvent] is a map from (type, state_key) to event. """ + if len(state_sets) == 1: + return state_sets[0] + unconflicted_state, conflicted_state = _seperate( state_sets, ) |