Improve If

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/InstantiationManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/InstantiationManager.java
index 1f1ff73d21cae9642ab887cf9f044c4f599705c1..478077a2d37469bcc11c0a955a33ddbd81f221ea 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/InstantiationManager.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/InstantiationManager.java
@@ -1,3 +1,19 @@
+/*\r
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
 package org.argeo.slc.core.execution;\r
 \r
 import java.util.Stack;\r
@@ -8,6 +24,7 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionFlow;\r
 import org.argeo.slc.execution.ExecutionSpecAttribute;\r
 \r
+/** Manage parameters that need to be set during the instantiation of a flow */\r
 public class InstantiationManager {\r
 \r
        private final static Log log = LogFactory\r
@@ -26,15 +43,15 @@ public class InstantiationManager {
        }\r
 \r
        public void flowInitializationStarted(ExecutionFlow flow, String flowName) {\r
-               if (log.isTraceEnabled())\r
-                       log.trace("Start initialization of " + flow.hashCode() + " ("\r
-                                       + flow + " - " + flow.getClass() + ")");\r
-\r
                // set the flow name if it is DefaultExecutionFlow\r
                if (flow instanceof DefaultExecutionFlow) {\r
                        ((DefaultExecutionFlow) flow).setBeanName(flowName);\r
                }\r
 \r
+               if (log.isTraceEnabled())\r
+                       log.trace("Start initialization of " + flow.hashCode() + " ("\r
+                                       + flow + " - " + flow.getClass() + ")");\r
+\r
                // log.info("# flowInitializationStarted " + flowName);\r
                // create a stack for this thread if there is none\r
                if (flowStack.get() == null) {\r
@@ -47,12 +64,18 @@ public class InstantiationManager {
                if (log.isTraceEnabled())\r
                        log.trace("Finish initialization of " + flow.hashCode() + " ("\r
                                        + flow + " - " + flow.getClass() + ")");\r
-               ExecutionFlow registeredFlow = flowStack.get().pop();\r
-               if (registeredFlow != null) {\r
-                       if (!flow.getName().equals(registeredFlow.getName()))\r
-                               throw new SlcException("Current flow is " + flow);\r
-                       // log.info("# flowInitializationFinished " + flowName);\r
-                       // initializingFlow.set(null);\r
+\r
+               if (flowStack.get() != null) {\r
+                       ExecutionFlow registeredFlow = flowStack.get().pop();\r
+                       if (registeredFlow != null) {\r
+                               if (!flow.getName().equals(registeredFlow.getName()))\r
+                                       throw new SlcException("Current flow is " + flow);\r
+                               // log.info("# flowInitializationFinished " + flowName);\r
+                               // initializingFlow.set(null);\r
+                       }\r
+               } else {\r
+                       // happens for flows imported as services\r
+                       log.warn("flowInitializationFinished - Flow Stack is null");\r
                }\r
        }\r
 \r
@@ -81,9 +104,14 @@ public class InstantiationManager {
                                .getExecutionSpec().getAttributes().get(key);\r
                if (attr instanceof RefSpecAttribute)\r
                        return ((RefSpecAttribute) attr).getTargetClass();\r
-               else if (attr instanceof PrimitiveSpecAttribute)\r
-                       return ((PrimitiveSpecAttribute) attr).getTypeAsClass();\r
-               else\r
+               else if (attr instanceof PrimitiveSpecAttribute) {\r
+                       String type = ((PrimitiveSpecAttribute) attr).getType();\r
+                       Class<?> clss = PrimitiveUtils.typeAsClass(type);\r
+                       if (clss == null)\r
+                               throw new SlcException("Cannot convert type " + type\r
+                                               + " to class.");\r
+                       return clss;\r
+               } else\r
                        return null;\r
        }\r
 \r