summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-12 14:59:43 +0100
committerErik Johnston <erik@matrix.org>2016-09-12 14:59:51 +0100
commit706b5d76edad4fec636f699ba2e7dbec8d943d13 (patch)
treeba0324e8db7bdefb2bce175b58645b2fff021e5b /synapse/federation
parentMerge pull request #1104 from matrix-org/markjh/direct_to_device_federation_sync (diff)
downloadsynapse-706b5d76edad4fec636f699ba2e7dbec8d943d13.tar.xz
Fix backfill when cannot find an event.
`get_pdu` can succeed but return None.
Diffstat (limited to 'synapse/federation')
-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)