Merge pull request #610 from Rugvip/unique-user

handlers/register: make sure another user id is generated when a collision occurs

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