Merge pull request #1040 from matrix-org/erikj/pagination

Add None checks to backfill
2016-08-24 10:59:55 +01:00 · 2016-08-24 10:59:55 +01:00 · 3e86dcf1c0
parent 928b2187ea 86bcf4d6a7
commit 3e86dcf1c0
1 changed files with 2 additions and 2 deletions
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@ -373,9 +373,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)