summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-02-09 18:09:30 +0000
committerMark Haines <mjark@negativecurvature.net>2015-02-09 18:09:30 +0000
commit5c5f5c1f0e3a2369562e4e2fa96123e825dfa5f5 (patch)
tree04d26373c6db97aef4e4fb60b5c0e74c3ea24c3d /synapse/state.py
parentMerge pull request #57 from matrix-org/transaction_counters (diff)
parentDuring room intial sync, only calculate current state once. (diff)
downloadsynapse-5c5f5c1f0e3a2369562e4e2fa96123e825dfa5f5.tar.xz
Merge pull request #56 from matrix-org/room_initial_sync_perf
During room intial sync, only calculate current state once.
Diffstat (limited to 'synapse/state.py')
-rw-r--r--synapse/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 695a5e7ac4..54380b9e5c 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -76,7 +76,7 @@ class StateHandler(object):
             defer.returnValue(res[1].get((event_type, state_key)))
             return
 
-        defer.returnValue(res[1].values())
+        defer.returnValue(res[1])
 
     @defer.inlineCallbacks
     def compute_event_context(self, event, old_state=None):