LDAP: Prevent error when mergeing into existing user

yona-projects · Jul 7, 2017 · d484f59 · d484f59
1 parent 4771561
commit d484f59
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java
@@ -1168,6 +1168,7 @@ public static User authenticateWithLdap(String loginIdOrEmail, String password)
                     User.resetPassword(localUserFoundByLdapLogin.loginId, password);
                 }
 
+                localUserFoundByLdapLogin.refresh();
                 localUserFoundByLdapLogin.name = ldapUser.getDisplayName();
                 localUserFoundByLdapLogin.update();
                 return localUserFoundByLdapLogin;