Improve If

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / DefaultExecutionFlow.java

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 c24ade0a30032c866b1d859e9f76c391ee5f146a..afb6ddbd2b8c72f4e955ded044fb0726dbc9f22e 100644 (file)
--- 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
@@ -15,10 +31,12 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.structure.StructureAware;
 import org.argeo.slc.structure.StructureRegistry;
+import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
 
+/** Default implementation of an execution flow. */
 public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                BeanNameAware {
        private final static Log log = LogFactory
@@ -66,13 +84,13 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                        ExecutionSpecAttribute attr = executionSpec.getAttributes()
                                        .get(key);
 
-                       if (attr.getIsParameter() && !isSetAsParameter(key)) {
-                               errors.rejectValue(key, "Parameter not set");
+                       if (attr.getIsImmutable() && !isSetAsParameter(key)) {
+                               errors.rejectValue(key, "Immutable but not set");
                                break;
                        }
 
-                       if (attr.getIsFrozen() && !isSetAsParameter(key)) {
-                               errors.rejectValue(key, "Frozen but not set as parameter");
+                       if (attr.getIsConstant() && !isSetAsParameter(key)) {
+                               errors.rejectValue(key, "Constant but not set as parameter");
                                break;
                        }
 
@@ -91,9 +109,23 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        public void run() {
                try {
                        for (Runnable executable : executables) {
-                               doExecuteRunnable(executable);
+                               if (Thread.interrupted()) {
+                                       log.error("Flow '" + getName() + "' killed before '"
+                                                       + executable + "'");
+                                       Thread.currentThread().interrupt();
+                                       return;
+                                       // throw new ThreadDeath();
+                               }
+                               this.doExecuteRunnable(executable);
                        }
                } catch (RuntimeException e) {
+                       if (Thread.interrupted()) {
+                               log.error("Flow '" + getName()
+                                               + "' killed while receiving an unrelated exception", e);
+                               Thread.currentThread().interrupt();
+                               return;
+                               // throw new ThreadDeath();
+                       }
                        if (failOnError)
                                throw e;
                        else {
@@ -121,7 +153,8 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 
                if (path != null) {
                        for (Runnable executable : executables) {
-                               if (executable instanceof StructureAware) {
+                               if (executable instanceof StructureAware
+                                               && !(executable instanceof ScopedObject)) {
                                        ((StructureAware<TreeSPath>) executable).notifyCurrentPath(
                                                        registry, new TreeSPath(path));
                                } else if (executable instanceof DefaultExecutionFlow) {