diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java index cc79511daf9a38e01774e8b34d272341d177b49a..d0edd90d3052f4f1e64e54b4a2d7beb8355d9abd 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java @@ -129,6 +129,7 @@ public class UpdatePersonExecutor } IRoleAssignmentDAO roleAssignmenDAO = daoFactory.getRoleAssignmentDAO(); person.setActive(false); + person.setDisplaySettings(null); person.clearAuthorizationGroups(); // Direct iteration over role assignments could lead to a // ConcurrentModificationException because roleAssignmentDAO.deleteRoleAssignment() diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java index 0c8be1bc0d4ff0ca450ad880f2a0e0454fa8c139..8a889f811abcf6e6680d812240c5043e607707a6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java @@ -442,6 +442,7 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp { IRoleAssignmentDAO roleAssignmenDAO = getDAOFactory().getRoleAssignmentDAO(); person.setActive(false); + person.setDisplaySettings(null); person.clearAuthorizationGroups(); // Direct iteration over role assignments could lead to a // ConcurrentModificationException because roleAssignmentDAO.deleteRoleAssignment() diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java index f6d839aa1735af79112e99a1e70da1971032d825..0dae85353b67b1c3fedb4f6132266e7565d7a761 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java @@ -150,6 +150,7 @@ public class RevokeUserAccessMaintenanceTask implements IMaintenanceTask // Change userId and disable person.setUserId(person.getUserId() + "-" + getTimeStamp()); person.setActive(false); + person.setDisplaySettings(null); personDAO.updatePerson(person); operationLog.info("person " + userIdToRevoke + " has been revoked.");