updated

diff --git a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
index b8edad5cd88185717412cd37cfcc9d22ed05ff5a..9223852bf8aa4802856333cf39dcab50550001d1 100644 (file)
--- a/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
+++ b/Workspace/Siman-Common/src/org/splat/service/StudyServiceImpl.java
@@ -34,12 +34,12 @@ import org.splat.dal.bo.som.Publication;
 import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.Study;
+import org.splat.dal.bo.som.Study.Properties;
 import org.splat.dal.bo.som.ValidationCycle;
+import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.bo.som.ValidationCycleRelation;
 import org.splat.dal.bo.som.ValidationStep;
 import org.splat.dal.bo.som.Visibility;
-import org.splat.dal.bo.som.Study.Properties;
-import org.splat.dal.bo.som.ValidationCycle.Actor;
 import org.splat.dal.dao.som.IDBuilderDAO;
 import org.splat.dal.dao.som.ScenarioDAO;
 import org.splat.dal.dao.som.StudyDAO;
@@ -990,7 +990,7 @@ public class StudyServiceImpl implements StudyService {
                
                aStudy.setMarkreference(1);
                aStudy.setProgressState(ProgressState.TEMPLATE);
-               getStudyDAO().update(aStudy);
+               getStudyDAO().merge(aStudy);
        }
        
        /**
@@ -1004,7 +1004,7 @@ public class StudyServiceImpl implements StudyService {
                
                aStudy.setMarkreference(0);
                aStudy.setProgressState(ProgressState.APPROVED);
-               getStudyDAO().update(aStudy);
+               getStudyDAO().merge(aStudy);
        }
 
        /**