SSDM-14263 : Deadlock on display settings

server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java

@@ -621,6 +621,12 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
 
         final Session session = sessionManager.getSession(sessionToken);
 
+        PersonPE attachedPerson = getDAOFactory().getPersonDAO().tryFindPersonByUserId(session.getUserName());
+        if(attachedPerson != null)
+        {
+            getDAOFactory().getPersonDAO().lock(attachedPerson);
+        }
+
         return displaySettingsProvider.executeActionWithPersonLock(session.getUserName(), new IDelegatedActionWithResult<SessionContextDTO>()
         {
             @Override public SessionContextDTO execute(final boolean didOperationSucceed)

server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java

@@ -150,6 +150,12 @@ public class GeneralInformationChangingService extends
             final PersonPE person = session.tryGetPerson();
             if (person != null)
             {
+                PersonPE attachedPerson = getDAOFactory().getPersonDAO().tryFindPersonByUserId(person.getUserId());
+                if(attachedPerson != null)
+                {
+                    getDAOFactory().getPersonDAO().lock(attachedPerson);
+                }
+
                 displaySettingsProvider.executeActionWithPersonLock(person, new IDelegatedActionWithResult<Object>()
                 {
                     @Override public Object execute(final boolean didOperationSucceed)