summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-02-29 23:11:06 +0100
committerPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-02-29 23:12:37 +0100
commit9c48f1ed224e02c30d73388c5e6a5839976bbc58 (patch)
treeaff48a664d4911660e2f6b7c50caaf7cb3878bbb /synapse/handlers
parentMerge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff)
downloadsynapse-9c48f1ed224e02c30d73388c5e6a5839976bbc58.tar.xz
handlers/register: make sure another user id is generated when a collision occurs
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py1
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