mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/release-v1.11.1' into develop

Browse source
This commit is contained in:
Patrick Cloke 2020-02-27 13:47:44 -05:00
commit ab0073a6c0
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6996.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug which caused an error when joining a room, with `'coroutine' object has no attribute 'event_id'`.

14
synapse/federation/federation_base.py
View file

@ -96,12 +96,14 @@ class FederationBase(object):
if not res and pdu.origin != origin:
try:
res = yield self.get_pdu(
destinations=[pdu.origin],
event_id=pdu.event_id,
room_version=room_version,
outlier=outlier,
timeout=10000,
res = yield defer.ensureDeferred(
self.get_pdu(
destinations=[pdu.origin],
event_id=pdu.event_id,
room_version=room_version,
outlier=outlier,
timeout=10000,
)
)
except SynapseError:
pass