summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-04 16:51:23 +0000
committerErik Johnston <erik@matrix.org>2014-11-04 16:51:23 +0000
commitda4a09f977181ae222438dc75f5717cbebc6fe86 (patch)
treec2cdc7e10ca0f6f0c51211291d72c771dfa5c7b3
parentPEP8 (diff)
downloadsynapse-da4a09f977181ae222438dc75f5717cbebc6fe86.tar.xz
Don't bother locking
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 8848656b1d..06a2dabae2 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -132,12 +132,11 @@ class FederationHandler(BaseHandler):
         # TODO: Implement something in federation that allows us to
         # respond to PDU.
 
-        with (yield self.room_lock.lock(event.room_id)):
-            yield self.store.persist_event(
-                event,
-                backfilled,
-                is_new_state=is_new_state
-            )
+        yield self.store.persist_event(
+            event,
+            backfilled,
+            is_new_state=is_new_state
+        )
 
         room = yield self.store.get_room(event.room_id)