From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 30 Jul 2009 20:38:59 +0000 (+0000)
Subject: Add failOnError property
X-Git-Tag: argeo-slc-2.1.7~1569
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5e28cf8cc3e7cb06b4ed541402dd5cf750845ea8;p=gpl%2Fargeo-slc.git

Add failOnError property

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index a25034e34..a1857a8c1 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.structure.tree.TreeSRegistry;
@@ -19,6 +21,8 @@ import org.springframework.validation.MapBindingResult;
 
 public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		BeanNameAware {
+	private final static Log log = LogFactory
+			.getLog(DefaultExecutionFlow.class);
 
 	private final ExecutionSpec executionSpec;
 	private String name = null;
@@ -28,6 +32,8 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	private String path;
 	private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
 
+	private Boolean failOnError = true;
+
 	public DefaultExecutionFlow() {
 		this.executionSpec = new DefaultExecutionSpec();
 	}
@@ -83,8 +89,21 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	}
 
 	public void run() {
-		for (Runnable executable : executables) {
-			executable.run();
+		try {
+			for (Runnable executable : executables) {
+				executable.run();
+			}
+		} catch (RuntimeException e) {
+			if (failOnError)
+				throw e;
+			else {
+				log.error("Execution flow failed,"
+						+ " but process did not fail"
+						+ " because failOnError property"
+						+ " is set to false: " + e, e);
+				if (log.isTraceEnabled())
+					e.printStackTrace();
+			}
 		}
 	}
 
@@ -173,4 +192,12 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 		this.registry = registry;
 	}
 
+	public Boolean getFailOnError() {
+		return failOnError;
+	}
+
+	public void setFailOnError(Boolean failOnError) {
+		this.failOnError = failOnError;
+	}
+
 }