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

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

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'`.

View File

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