Also do check inside linearizer

matrix-org · Mar 27, 2018 · 3e0c066 · 3e0c066
1 parent 44cd6e1
commit 3e0c066
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
@@ -350,9 +350,10 @@ def check_user_id_not_appservice_exclusive(self, user_id, allowed_appservice=Non
     def _generate_user_id(self, reseed=False):
         if reseed or self._next_generated_user_id is None:
             with (yield self._generate_user_id_linearizer.queue(())):
-                self._next_generated_user_id = (
-                    yield self.store.find_next_generated_user_id_localpart()
-                )
+                if reseed or self._next_generated_user_id is None:
+                    self._next_generated_user_id = (
+                        yield self.store.find_next_generated_user_id_localpart()
+                    )
 
         id = self._next_generated_user_id
         self._next_generated_user_id += 1