getHibernateTemplate().save(slcExecution);\r
}\r
\r
- public void update(SlcExecution slcExecution) {\r
+ public void update(final SlcExecution slcExecution) {\r
getHibernateTemplate().update(slcExecution);\r
}\r
\r
+ public void merge(final SlcExecution slcExecution) {\r
+ getHibernateTemplate().merge(slcExecution);\r
+ }\r
+\r
public SlcExecution getSlcExecution(String uuid) {\r
return (SlcExecution) getHibernateTemplate().get(SlcExecution.class,\r
uuid);\r
import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
import org.hibernate.HibernateException;\r
+import org.hibernate.LockMode;\r
import org.hibernate.Session;\r
import org.hibernate.action.Executable;\r
\r
getHibernateTemplate().execute(new HibernateCallback() {\r
public Object doInHibernate(Session session)\r
throws HibernateException, SQLException {\r
- session.refresh(ttrc);\r
+ session.lock(ttrc, LockMode.NONE);\r
TreeTestResult ttr = (TreeTestResult) session.get(\r
TreeTestResult.class, resultUuid);\r
ttrc.getResults().add(ttr);\r
getHibernateTemplate().execute(new HibernateCallback() {\r
public Object doInHibernate(Session session)\r
throws HibernateException, SQLException {\r
- session.refresh(ttrc);\r
+ session.lock(ttrc, LockMode.NONE);\r
TreeTestResult ttr = (TreeTestResult) session.get(\r
TreeTestResult.class, resultUuid);\r
if (ttrc.getResults().remove(ttr))\r