summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 11:03:16 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 11:03:16 +0000
commit2b042ad67fd16c43f3cfce472a8d1b31cff867da (patch)
tree8c6eec8f3e6a448f3d0a86a447d8d26f2ca71232
parentMove construction of object within if block (diff)
downloadsynapse-2b042ad67fd16c43f3cfce472a8d1b31cff867da.tar.xz
Oops, we do want to defer.return regardless of whether we are caching or not
-rw-r--r--synapse/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 2dea8f552a..31f503a1ee 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -261,7 +261,7 @@ class StateHandler(object):
 
                 self._state_cache[frozenset(event_ids)] = cache
 
-                defer.returnValue((name, state, prev_states))
+            defer.returnValue((name, state, prev_states))
 
         state = {}
         for group, g_state in state_groups.items():