summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-03-23 09:29:44 +0000
committerGitHub <noreply@github.com>2017-03-23 09:29:44 +0000
commit55366814a6619440ba5b405153d7b7fa5205f1d5 (patch)
tree2b6db37b78d845d38e10994f8f355f9cb9a1cef0
parentMerge pull request #2049 from matrix-org/rav/logcontext_leaks (diff)
parentAdd a missing yield in device key upload (diff)
downloadsynapse-55366814a6619440ba5b405153d7b7fa5205f1d5.tar.xz
Merge pull request #2048 from matrix-org/rav/missing_yield
Add a missing yield in device key upload
-rw-r--r--synapse/handlers/e2e_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py
index e40495d1ab..c02d41a74c 100644
--- a/synapse/handlers/e2e_keys.py
+++ b/synapse/handlers/e2e_keys.py
@@ -316,7 +316,7 @@ class E2eKeysHandler(object):
         # old access_token without an associated device_id. Either way, we
         # need to double-check the device is registered to avoid ending up with
         # keys without a corresponding device.
-        self.device_handler.check_device_registered(user_id, device_id)
+        yield self.device_handler.check_device_registered(user_id, device_id)
 
         result = yield self.store.count_e2e_one_time_keys(user_id, device_id)