summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-08 11:53:25 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 11:53:25 +0000
commit587d8ac60fdceb0686c7bd498688d8f10bd175a1 (patch)
tree40d91c2275a162810d0e74f1087792875e6e4fb9
parentMerge pull request #1198 from euank/more-ip-blacklist (diff)
downloadsynapse-587d8ac60fdceb0686c7bd498688d8f10bd175a1.tar.xz
Correctly intern keys in state cache
-rw-r--r--synapse/storage/state.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 49abf0ac74..23e7ad9922 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -653,7 +653,10 @@ class StateStore(SQLBaseStore):
                 else:
                     state_dict = results[group]
 
-                state_dict.update(group_state_dict)
+                state_dict.update({
+                    (intern_string(k[0]), intern_string(k[1])): v
+                    for k, v in group_state_dict.items()
+                })
 
                 self._state_group_cache.update(
                     cache_seq_num,