diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-21 14:54:52 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-21 14:54:52 +0100 |
| commit | ebfdd2eb5bd9c27ec25b365c544a458b4e92f157 (patch) | |
| tree | 1a6d7abe69139aa3864af6ccbd0689c494c278b7 /synapse/federation | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf (diff) | |
| parent | Merge pull request #155 from matrix-org/erikj/perf (diff) | |
| download | synapse-ebfdd2eb5bd9c27ec25b365c544a458b4e92f157.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index 4b3bf97835..ecb6dbd770 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -223,7 +223,7 @@ class FederationClient(FederationBase): for p in transaction_data["pdus"] ] - if pdu_list: + if pdu_list and pdu_list[0]: pdu = pdu_list[0] # Check signatures are correct. @@ -256,7 +256,7 @@ class FederationClient(FederationBase): ) continue - if self._get_pdu_cache is not None: + if self._get_pdu_cache is not None and pdu: self._get_pdu_cache[event_id] = pdu defer.returnValue(pdu) @@ -566,7 +566,7 @@ class FederationClient(FederationBase): res = yield defer.DeferredList(deferreds, consumeErrors=True) for (result, val), (e_id, _) in zip(res, ordered_missing): - if result: + if result and val: signed_events.append(val) else: failed_to_fetch.add(e_id) |