From bc9f81b6188850b83f872c70073a7490f55d7819 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 8 Jul 2010 08:47:11 +0000
Subject: [PATCH] [LMS-1603] workaround - use merge() instead of update()

SVN: 16932
---
 .../cisd/openbis/generic/server/dataaccess/db/PersonDAO.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
index 801af9b5670..e1d924a1772 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
@@ -88,7 +88,7 @@ public final class PersonDAO extends AbstractGenericEntityDAO<PersonPE> implemen
         validatePE(person);
 
         final HibernateTemplate template = getHibernateTemplate();
-        template.update(person);
+        template.merge(person); // WORKAROUND update cannot be used - see LMS-1603
         template.flush();
         if (operationLog.isInfoEnabled())
         {
-- 
GitLab