kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Fix NPE when trying to grab event from wrong roomId (fix sytest)

Browse Source 
See https://github.com/matrix-org/synapse/pull/11114#discussion_r741687508
This commit is contained in:
Eric Eastwood
2021-12-16 17:52:13 -06:00
parent 3810ae10aa
commit df2a1523fc
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
synapse/storage/databases/main/event_federation.py
+18 -17
View File
@@ -1165,25 +1165,26 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
allow_none=True,
)
logger.debug(
"_get_backfill_events(room_id=%s): seed_event_id=%s depth=%s stream_ordering=%s type=%s",
room_id,
seed_event_id,
event_lookup_result["depth"],
event_lookup_result["stream_ordering"],
event_lookup_result["type"],
)
if event_lookup_result["depth"]:
queue.put(
(
-event_lookup_result["depth"],
-event_lookup_result["stream_ordering"],
seed_event_id,
event_lookup_result["type"],
)
if event_lookup_result is not None:
logger.debug(
"_get_backfill_events(room_id=%s): seed_event_id=%s depth=%s stream_ordering=%s type=%s",
room_id,
seed_event_id,
event_lookup_result["depth"],
event_lookup_result["stream_ordering"],
event_lookup_result["type"],
)
if event_lookup_result["depth"]:
queue.put(
(
-event_lookup_result["depth"],
-event_lookup_result["stream_ordering"],
seed_event_id,
event_lookup_result["type"],
)
)
while not queue.empty() and len(event_id_results) < limit:
try:
_, _, event_id, event_type = queue.get_nowait()