summary refs log tree commit diff
path: root/synapse/storage/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-10 15:55:03 +0000
committerErik Johnston <erik@matrix.org>2014-12-10 15:55:03 +0000
commit1d2a0040cff8d04cdc7d7d09d8f04a5d628fa9dd (patch)
treeb1d643a63742b6827768b6a4b580b5e4c490983e /synapse/storage/__init__.py
parentActually fix bug when uploading state with empty state_key (diff)
downloadsynapse-1d2a0040cff8d04cdc7d7d09d8f04a5d628fa9dd.tar.xz
Fix bug where we clobbered old state group values
Diffstat (limited to 'synapse/storage/__init__.py')
-rw-r--r--synapse/storage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index f8d895082d..2db2e9720f 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -220,7 +220,8 @@ class DataStore(RoomMemberStore, RoomStore,
             room_id=event.room_id,
         )
 
-        self._store_state_groups_txn(txn, event, context)
+        if not outlier:
+            self._store_state_groups_txn(txn, event, context)
 
         if current_state:
             txn.execute(