[LMS-1453] improved workaround

SVN: 15247

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBO.java

@@ -657,6 +657,8 @@ public class ExternalDataBO extends AbstractExternalDataBusinessObject implement
 
     public void updateStatus(String dataSetCode, DataSetArchivizationStatus newStatus)
     {
+        // WORKAROUND: clearing session solved StaleObjectStateException problem
+        getExternalDataDAO().clearSession();
         loadByCode(dataSetCode, false, true);
         externalData.setStatus(newStatus);
         validateAndSave();

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGenericDAO.java

@@ -84,4 +84,6 @@ public interface IGenericDAO<T extends IIdHolder>
      */
     public List<T> listAllEntities() throws DataAccessException;
 
+    public void clearSession();
+
 }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java

@@ -161,4 +161,10 @@ public abstract class AbstractGenericEntityDAO<T extends IIdHolder> extends Abst
     {
         return cast(getHibernateTemplate().loadAll(getEntityClass()));
     }
+
+    public void clearSession()
+    {
+        getHibernateTemplate().clear();
+    }
+
 }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBOTest.java

@@ -294,6 +294,7 @@ public class ExternalDataBOTest extends AbstractBOTest
         context.checking(new Expectations()
             {
                 {
+                    one(externalDataDAO).clearSession();
                     one(externalDataDAO).tryToFindFullDataSetByCode(dataSet.getCode(), false, true);
                     will(returnValue(dataSet));
                     one(externalDataDAO).validateAndSaveUpdatedEntity(dataSet);