summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-24 13:22:02 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 13:22:02 +0100
commitfda97dd58ac41f2faf7561f43009f970a14afa42 (patch)
treede0f7aba18070b4c0e34b3b0e445d69e96b012bd /synapse
parentPreserve some logcontexts (diff)
parentMerge pull request #1040 from matrix-org/erikj/pagination (diff)
downloadsynapse-fda97dd58ac41f2faf7561f43009f970a14afa42.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_log_contexts
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index fe3092b14b..01a761715b 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -375,9 +375,9 @@ class FederationHandler(BaseHandler):
                     ],
                     consumeErrors=True
                 )).addErrback(unwrapFirstError)
-                auth_events.update({a.event_id: a for a in results})
+                auth_events.update({a.event_id: a for a in results if a})
                 required_auth.update(
-                    a_id for event in results for a_id, _ in event.auth_events
+                    a_id for event in results for a_id, _ in event.auth_events if event
                 )
                 missing_auth = required_auth - set(auth_events)