summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-03-29 11:53:42 +0100
committerGitHub <noreply@github.com>2017-03-29 11:53:42 +0100
commitb9c2ae67886a7d63a5dae6cec4d8bf47703a4ef7 (patch)
tree02396ae323d38ca008638e33c085479ce3915307 /synapse
parentBail early if remote wouldn't be retried (#2064) (diff)
parentFix bug where current_state_events renamed to current_state_ids (diff)
downloadsynapse-b9c2ae67886a7d63a5dae6cec4d8bf47703a4ef7.tar.xz
Merge pull request #1849 from matrix-org/erikj/state_typo
Fix bug where current_state_events renamed to current_state_ids
Diffstat (limited to 'synapse')
-rw-r--r--synapse/state.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 9a523a1b89..f6b83d888a 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -195,11 +195,11 @@ class StateHandler(object):
                     (s.type, s.state_key): s.event_id for s in old_state
                 }
                 if event.is_state():
-                    context.current_state_events = dict(context.prev_state_ids)
+                    context.current_state_ids = dict(context.prev_state_ids)
                     key = (event.type, event.state_key)
-                    context.current_state_events[key] = event.event_id
+                    context.current_state_ids[key] = event.event_id
                 else:
-                    context.current_state_events = context.prev_state_ids
+                    context.current_state_ids = context.prev_state_ids
             else:
                 context.current_state_ids = {}
                 context.prev_state_ids = {}