summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-11 14:16:41 +0000
committerErik Johnston <erik@matrix.org>2014-11-11 14:16:41 +0000
commit5ff0bfb81dfbf27d5c889113d08edb609a2d145a (patch)
treeba9280186f09559eb79ace3e867f1edaf35d7a4e /synapse/handlers
parentFix validation tests (diff)
downloadsynapse-5ff0bfb81dfbf27d5c889113d08edb609a2d145a.tar.xz
Fix bug where we /always/ created a new state group
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index e909af6bd8..c2cd91bb39 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -448,8 +448,9 @@ class FederationHandler(BaseHandler):
         )
 
         if state_groups:
+            _, state = state_groups.items().pop()
             results = {
-                (e.type, e.state_key): e for e in state_groups[0].state
+                (e.type, e.state_key): e for e in state
             }
 
             event = yield self.store.get_event(event_id)