summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-13 13:21:04 +0000
committerErik Johnston <erik@matrix.org>2017-01-17 13:22:34 +0000
commite6153e1bd10529b28b69820decbc039b9d6a1f27 (patch)
tree563252f7303a8854418ee5de356d3de8f13b2f45 /synapse/handlers
parentOptimise state resolution (diff)
downloadsynapse-e6153e1bd10529b28b69820decbc039b9d6a1f27.tar.xz
Fix couple of federation state bugs
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index ea89e0cf2d..ced5646e9a 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -596,7 +596,7 @@ class FederationHandler(BaseHandler):
             preserve_fn(self.state_handler.resolve_state_groups)(room_id, [e])
             for e in event_ids
         ]))
-        states = dict(zip(event_ids, [s[1] for s in states]))
+        states = dict(zip(event_ids, [s.state for s in states]))
 
         state_map = yield self.store.get_events(
             [e_id for ids in states.values() for e_id in ids],