Small enhancements

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index d8429d192d1d9675516d47a6365e0e199426f887..968debcb7ca25f7a992dcc0d15ae2e81a2c76755 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -39,11 +39,16 @@ public class DefaultExecutionFlowDescriptorConverter implements
                        ExecutionFlowDescriptor executionFlowDescriptor) {
                Map<String, Object> values = executionFlowDescriptor.getValues();
                Map<String, Object> convertedValues = new HashMap<String, Object>();
+               ExecutionSpec executionSpec = executionFlowDescriptor
+                               .getExecutionSpec();
 
-               if (values != null) {
+               if (executionSpec == null)
+                       log.warn("Execution spec is null for " + executionFlowDescriptor);
+
+               if (values != null && executionSpec != null) {
                        values: for (String key : values.keySet()) {
-                               ExecutionSpecAttribute attribute = executionFlowDescriptor
-                                               .getExecutionSpec().getAttributes().get(key);
+                               ExecutionSpecAttribute attribute = executionSpec
+                                               .getAttributes().get(key);
 
                                if (attribute.getIsFrozen())
                                        continue values;
@@ -86,7 +91,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
                        Assert.notNull(executionSpec.getName());
 
                        Map<String, Object> values = new TreeMap<String, Object>();
-                       attrs: for (String key : executionSpec.getAttributes().keySet()) {
+                       for (String key : executionSpec.getAttributes().keySet()) {
                                ExecutionSpecAttribute attribute = executionSpec
                                                .getAttributes().get(key);