Commit 1a84f1be authored by Manoj M J's avatar Manoj M J

Reset objects after obtaining lock

This change resets objects after obtaining lock
parent edb4eaa2
...@@ -24,11 +24,6 @@ module Users ...@@ -24,11 +24,6 @@ module Users
@source = source @source = source
@incorrect_auth_found_callback = incorrect_auth_found_callback @incorrect_auth_found_callback = incorrect_auth_found_callback
@missing_auth_found_callback = missing_auth_found_callback @missing_auth_found_callback = missing_auth_found_callback
# We need an up to date User object that has access to all relations that
# may have been created earlier. The only way to ensure this is to reload
# the User object.
user.reset
end end
def execute def execute
...@@ -43,6 +38,10 @@ module Users ...@@ -43,6 +38,10 @@ module Users
end end
begin begin
# We need an up to date User object that has access to all relations that
# may have been created earlier. The only way to ensure this is to reload
# the User object.
user.reset
execute_without_lease execute_without_lease
ensure ensure
Gitlab::ExclusiveLease.cancel(lease_key, uuid) Gitlab::ExclusiveLease.cancel(lease_key, uuid)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment