SERVER-35890 refactor User cache into InvalidatingLRUCache and UserHandle

1 files changed, 5 insertions, 5 deletions

diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp
index 82823e3cfcc..2fca9a9973f 100644
--- a/src/mongo/db/commands/user_management_commands.cpp
+++ b/src/mongo/db/commands/user_management_commands.cpp
@@ -147,17 +147,17 @@ Status getCurrentUserRoles(OperationContext* opCtx,
                            AuthorizationManager* authzManager,
                            const UserName& userName,
                            stdx::unordered_set<RoleName>* roles) {
-    User* user;
     authzManager->invalidateUserByName(userName);  // Need to make sure cache entry is up to date
-    Status status = authzManager->acquireUser(opCtx, userName, &user);
-    if (!status.isOK()) {
-        return status;
+    auto swUser = authzManager->acquireUser(opCtx, userName);
+    if (!swUser.isOK()) {
+        return swUser.getStatus();
     }
+    auto user = std::move(swUser.getValue());
+
     RoleNameIterator rolesIt = user->getRoles();
     while (rolesIt.more()) {
         roles->insert(rolesIt.next());
     }
-    authzManager->releaseUser(user);
     return Status::OK();
 }