mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-10-01 08:25:44 -04:00
Merge remote-tracking branch 'origin/release-v1.11.1' into develop
This commit is contained in:
commit
ab0073a6c0
1
changelog.d/6996.bugfix
Normal file
1
changelog.d/6996.bugfix
Normal file
@ -0,0 +1 @@
|
||||
Fix bug which caused an error when joining a room, with `'coroutine' object has no attribute 'event_id'`.
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user