X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fws%2Fprocess%2FSlcExecutionStepsRequestEp.java;h=738c2c69966afc0fc7acaa56a6261da5747d5738;hb=c21f3ae9746cd2bbc81dad813e9e590300433a52;hp=945ee80791f05e456014b418ea626eadb09226db;hpb=bcca148aeb93108ccfd325b33ed63a3928e02cc5;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java index 945ee8079..738c2c699 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java @@ -1,5 +1,7 @@ package org.argeo.slc.ws.process; +import java.util.List; + import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; import org.apache.commons.logging.Log; @@ -7,6 +9,7 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.SlcException; import org.argeo.slc.core.process.SlcExecution; +import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; @@ -27,20 +30,22 @@ public class SlcExecutionStepsRequestEp extends try { SlcExecutionStepsRequest msg = (SlcExecutionStepsRequest) requestObject; uuid = msg.getSlcExecutionUuid(); - SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid); - - if (slcExecution == null) - throw new SlcException("Could not find slc execution " + uuid); - - slcExecution.getSteps().addAll(msg.getSteps()); - - slcExecutionDao.update(slcExecution); - log.debug("Added " + msg.getSteps().size() - + " steps to SlcExecution with uuid " - + slcExecution.getUuid()); + if (log.isTraceEnabled()) { + log.trace("Trying to add additional steps to SLC execution #" + + uuid + ":"); + for (SlcExecutionStep step : msg.getSteps()) { + log.trace("Step " + step.getUuid() + " (in SLC execution #" + + uuid + ")"); + } + } + + log.debug("Adding " + msg.getSteps().size() + + " steps to SLC execution #" + uuid); + + slcExecutionDao.addSteps(uuid, msg.getSteps()); return null; } catch (Exception e) { - log.error("Could not update SlcExecution " + uuid + log.error("Could not update SLC execution #" + uuid + " with additional steps", e); throw e; }