summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-09-12 16:48:01 +0100
committerGitHub <noreply@github.com>2016-09-12 16:48:01 +0100
commit502c901e116cdd50207c4082e7b075016229a7f3 (patch)
tree63da086f60cfb896725fc3cb1665cd7fe09ed947 /synapse/federation/federation_client.py
parentMerge pull request #1106 from matrix-org/erikj/state_reindex_concurrent (diff)
parentFix backfill when cannot find an event. (diff)
downloadsynapse-502c901e116cdd50207c4082e7b075016229a7f3.tar.xz
Merge pull request #1107 from matrix-org/erikj/backfill_none
Fix backfill when cannot find an event.
Diffstat (limited to 'synapse/federation/federation_client.py')
-rw-r--r--synapse/federation/federation_client.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 3395c9e41e..fe01281c95 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -481,7 +481,7 @@ class FederationClient(FederationBase):
                 defer.DeferredList(deferreds, consumeErrors=True)
             )
             for success, result in res:
-                if success:
+                if success and result:
                     signed_events.append(result)
                     batch.discard(result.event_id)