summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-13 15:43:32 +0100
committerErik Johnston <erik@matrix.org>2015-05-13 15:43:32 +0100
commit8888982db3dbf839003fb544072348f73609724f (patch)
tree8d357012744ea347a657d421d760a6095370ec6d /synapse
parentDon't return None (diff)
downloadsynapse-8888982db3dbf839003fb544072348f73609724f.tar.xz
Don't insert None
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/_base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index f990b8149e..bb80108a30 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -1002,7 +1002,10 @@ class SQLBaseStore(object):
                     e.event_id, check_redacted, get_prev_content, e
                 )
 
-        return [event_map[e_id] for e_id in events if e_id in event_map]
+        return [
+            event_map[e_id] for e_id in events
+            if e_id in event_map and event_id[e_id]
+        ]
 
     def _get_event_from_row_txn(self, txn, internal_metadata, js, redacted,
                                 check_redacted=True, get_prev_content=False,