summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-18 11:11:33 +0100
committerErik Johnston <erik@matrix.org>2015-08-18 11:11:33 +0100
commit8e254862f49e5183b0a0e9c4a41ae1f1c3477418 (patch)
tree639616856343a8f6454e417473dd02a56c990eec /synapse
parentReduce cache size from obscenely large to quite large (diff)
downloadsynapse-8e254862f49e5183b0a0e9c4a41ae1f1c3477418.tar.xz
Don't assume @cachedList function returns keys for everything
Diffstat (limited to '')
-rw-r--r--synapse/util/caches/descriptors.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py
index 83bfec2f02..362944bc51 100644
--- a/synapse/util/caches/descriptors.py
+++ b/synapse/util/caches/descriptors.py
@@ -293,7 +293,7 @@ class CacheListDescriptor(object):
                 # we can insert the new deferred into the cache.
                 for arg in missing:
                     observer = ret_d.observe()
-                    observer.addCallback(lambda r, arg: r[arg], arg)
+                    observer.addCallback(lambda r, arg: r.get(arg, None), arg)
 
                     observer = ObservableDeferred(observer)