From a75f8686ba4c536db1a9e341786ac34bab3d25c7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 9 Sep 2014 16:27:59 +0100 Subject: [PATCH] Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction --- synapse/storage/__init__.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index a2eec3b20..ad2a484c1 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -77,7 +77,7 @@ class DataStore(RoomMemberStore, RoomStore, stream_ordering = self.min_token try: - latest = yield self._db_pool.runInteraction( + yield self._db_pool.runInteraction( self._persist_pdu_event_txn, pdu=pdu, event=event, @@ -86,7 +86,6 @@ class DataStore(RoomMemberStore, RoomStore, ) except _RollbackButIsFineException as e: pass - defer.returnValue(latest) @defer.inlineCallbacks def get_event(self, event_id, allow_none=False): @@ -214,8 +213,6 @@ class DataStore(RoomMemberStore, RoomStore, } ) - return self._get_room_events_max_id_txn(txn) - @defer.inlineCallbacks def get_current_state(self, room_id, event_type=None, state_key=""): sql = (