mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-01 02:06:05 -04:00
Fix None exception in state res v2
This commit is contained in:
parent
1b21e771d0
commit
54aec35867
2 changed files with 102 additions and 2 deletions
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue