diff options
author | Erik Johnston <erik@matrix.org> | 2016-03-04 09:40:20 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-03-04 09:40:20 +0000 |
commit | ce82b9e48f0f01775a3b2b07963d9dc34d444f6d (patch) | |
tree | a1d101e6f5a39e842771afe62041da7fda3d3bb0 | |
parent | Merge pull request #623 from matrix-org/rav/fix_createroom_race (diff) | |
parent | handlers/register: make sure another user id is generated when a collision oc... (diff) | |
download | synapse-ce82b9e48f0f01775a3b2b07963d9dc34d444f6d.tar.xz |
Merge pull request #610 from Rugvip/unique-user
handlers/register: make sure another user id is generated when a collision occurs
-rw-r--r-- | synapse/handlers/register.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 6d155d57e7..c5e5b28811 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -157,6 +157,7 @@ class RegistrationHandler(BaseHandler): ) except SynapseError: # if user id is taken, just generate another + user = None user_id = None token = None attempts += 1 |