summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-01 18:02:43 +0100
committerErik Johnston <erik@matrix.org>2016-06-01 18:02:43 +0100
commit9e54d865e6e6f2d369cbfb8976ec04d06a1891a4 (patch)
tree1efd128cdc435c37367df74c15cae646d65e9a34 /synapse
parentMake cachedList go a bit faster (diff)
parentMerge pull request #813 from matrix-org/dbkr/fix_room_list_spidering (diff)
downloadsynapse-9e54d865e6e6f2d369cbfb8976ec04d06a1891a4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 77063b021a..9fd34588dd 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -441,7 +441,7 @@ class RoomListHandler(BaseHandler):
             self.hs.config.secondary_directory_servers
         )
         self.remote_list_request_cache.set((), deferred)
-        yield deferred
+        self.remote_list_cache = yield deferred
 
     @defer.inlineCallbacks
     def get_aggregated_public_room_list(self):