From f2802a24e790f2e0c85d47b6745dc3ec454be25f Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Wed, 20 Dec 2023 12:24:14 +0100
Subject: [PATCH] Revert "SSDM-14263 : Deadlock on display settings"
This reverts commit d2dc0a00c01a65da9e781573471cd15d8b447c4c.
---
.../cisd/openbis/generic/server/AbstractServer.java | 6 ------
.../server/api/v1/GeneralInformationChangingService.java | 6 ------
2 files changed, 12 deletions(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index 4e1e72471a3..cb5e1d90108 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -621,12 +621,6 @@ 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)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
index 9226110c325..c724f7d56b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
@@ -150,12 +150,6 @@ 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)
--
GitLab