Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface

1 files changed, 4 insertions, 3 deletions

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index e07cf3b58a..e1f29a3aca 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -184,8 +184,8 @@ class CacheDescriptor(object):
             try:
                 cached_result_d = self.cache.get(keyargs)
 
+                observed = cached_result_d.observe()
                 if DEBUG_CACHES:
-
                     @defer.inlineCallbacks
                     def check_result(cached_result):
                         actual_result = yield self.function_to_call(obj, *args, **kwargs)
@@ -196,9 +196,10 @@ class CacheDescriptor(object):
                                 cached_result, actual_result,
                             )
                             raise ValueError("Stale cache entry")
-                    cached_result_d.observe().addCallback(check_result)
+                        defer.returnValue(cached_result)
+                    observed.addCallback(check_result)
 
-                return cached_result_d.observe()
+                return observed
             except KeyError:
                 # Get the sequence number of the cache before reading from the
                 # database so that we can tell if the cache is invalidated