Improve web services

[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 f92dbc68e6782e0c758f7d8ca5f32bd98faf1348..3c41d9afd5e7d706885a3328a80ccbfd98fec96e 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
@@ -30,13 +30,13 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint {
 
                        if (slcExecutionDao.getSlcExecution(slcExecution.getUuid()) == null) {
                                if (log.isDebugEnabled())
-                                       log.debug("Creating SlcExecution with uuid "
+                                       log.debug("Creating SLC execution #"
                                                        + slcExecution.getUuid());
 
                                slcExecutionDao.create(slcExecution);
                        } else {
                                if (log.isDebugEnabled())
-                                       log.debug("Updating SlcExecution with uuid "
+                                       log.debug("Updating SLC execution #"
                                                        + slcExecution.getUuid());
 
                                slcExecutionDao.update(slcExecution);
@@ -47,6 +47,10 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint {
                        SlcExecutionStatusRequest msg = (SlcExecutionStatusRequest) requestObject;
                        SlcExecution slcExecution = slcExecutionDao.getSlcExecution(msg
                                        .getSlcExecutionUuid());
+                       if (slcExecution == null)
+                               throw new SlcException("Could not find SLC execution #"
+                                               + msg.getSlcExecutionUuid());
+
                        slcExecution.setStatus(msg.getNewStatus());
                        slcExecutionDao.update(slcExecution);
                        return null;