Improve exception handling

git-svn-id: https://svn.argeo.org/slc/trunk@1042 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.server/pom.xml b/org.argeo.slc.server/pom.xml
index d4dcaf9ed63c3d10998e88bfeb75992159dfe787..99b724cd497dce9a196fe1ab3c245a5c74dd8ead 100644 (file)
--- a/org.argeo.slc.server/pom.xml
+++ b/org.argeo.slc.server/pom.xml
@@ -37,6 +37,8 @@
                                        <webAppSourceDirectory>\r
                                                ../org.argeo.slc.webapp/src/main/webapp\r
                                        </webAppSourceDirectory>\r
+                                       <stopKey>stopKey</stopKey>\r
+                                       <stopPort>8081</stopPort>\r
                                        <scanTargetPatterns>\r
                                                <scanTargetPattern>\r
                                                        <directory>\r

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 df36ed34a3290690fa39392f9f9b38c1b1f1b943..945ee80791f05e456014b418ea626eadb09226db 100644 (file)
--- 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
@@ -5,6 +5,7 @@ import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.argeo.slc.core.SlcException;
 import org.argeo.slc.core.process.SlcExecution;
 import org.argeo.slc.dao.process.SlcExecutionDao;
 import org.argeo.slc.msg.process.SlcExecutionStepsRequest;
@@ -28,11 +29,14 @@ public class SlcExecutionStepsRequestEp extends
                        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 "
+                                       + " steps to SlcExecution with uuid "
                                        + slcExecution.getUuid());
                        return null;
                } catch (Exception e) {