Introduce transaction management

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / ws / process / SlcExecutionRequestEp.java

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java
index 10a7aab22d3edcecd4c76b0541292aab0c42771b..e9e63da0fc4b16493e047f8ef5cad3dd63c0827e 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java
@@ -26,20 +26,21 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint {
                if (requestObject instanceof SlcExecutionRequest) {
 
                        SlcExecutionRequest msg = (SlcExecutionRequest) requestObject;
-                       SlcExecution slcExecution = msg.getSlcExecution();
+                       SlcExecution slcExecutionMsg = msg.getSlcExecution();
 
-                       if (slcExecutionDao.getSlcExecution(slcExecution.getUuid()) == null) {
+                       SlcExecution slcExecutionPersisted = slcExecutionDao.getSlcExecution(slcExecutionMsg.getUuid());
+                       if (slcExecutionPersisted == null) {
                                if (log.isTraceEnabled())
                                        log.trace("Creating SLC execution #"
-                                                       + slcExecution.getUuid());
+                                                       + slcExecutionMsg.getUuid());
 
-                               slcExecutionDao.create(slcExecution);
+                               slcExecutionDao.create(slcExecutionMsg);
                        } else {
                                if (log.isTraceEnabled())
                                        log.trace("Updating SLC execution #"
-                                                       + slcExecution.getUuid());
+                                                       + slcExecutionMsg.getUuid());
 
-                               slcExecutionDao.update(slcExecution);
+                               slcExecutionDao.merge(slcExecutionMsg);
                        }
                        return null;
 
@@ -64,5 +65,4 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint {
                                        + requestObject.getClass());
                }
        }
-
 }