summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-06 09:31:40 +0100
committerErik Johnston <erik@matrix.org>2015-07-06 09:33:03 +0100
commit65e69dec8b202e3f03063b18ebde55ceee69e2e7 (patch)
treec8a01e5e8ac1c05641e9a599c96536696d3cd171 /synapse
parentMerge pull request #195 from matrix-org/erikj/content_disposition (diff)
downloadsynapse-65e69dec8b202e3f03063b18ebde55ceee69e2e7.tar.xz
Don't explode if we don't recognize one of the event_ids in the backfill request
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/event_federation.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py
index ace7459538..c71019d93b 100644
--- a/synapse/storage/event_federation.py
+++ b/synapse/storage/event_federation.py
@@ -408,10 +408,12 @@ class EventFederationStore(SQLBaseStore):
                 keyvalues={
                     "event_id": event_id,
                 },
-                retcol="depth"
+                retcol="depth",
+                allow_none=True,
             )
 
-            queue.put((-depth, event_id))
+            if depth:
+                queue.put((-depth, event_id))
 
         while not queue.empty() and len(event_results) < limit:
             try: