reintroduce Spring Security Authenticaiton in SLC

[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 af2763d66ace105a944a7d76119a485750ad20a8..a67a5059a0912be793db2249c56ea34c13730d49 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,5 +1,5 @@
 /*\r
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\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
@@ -13,7 +13,6 @@
  * 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
@@ -24,6 +23,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
@@ -46,7 +46,7 @@ public class InstantiationManager {
                if (flow instanceof DefaultExecutionFlow) {\r
                        ((DefaultExecutionFlow) flow).setBeanName(flowName);\r
                }\r
-               \r
+\r
                if (log.isTraceEnabled())\r
                        log.trace("Start initialization of " + flow.hashCode() + " ("\r
                                        + flow + " - " + flow.getClass() + ")");\r
@@ -63,8 +63,8 @@ public class InstantiationManager {
                if (log.isTraceEnabled())\r
                        log.trace("Finish initialization of " + flow.hashCode() + " ("\r
                                        + flow + " - " + flow.getClass() + ")");\r
-               \r
-               if(flowStack.get() != 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
@@ -72,8 +72,7 @@ public class InstantiationManager {
                                // log.info("# flowInitializationFinished " + flowName);\r
                                // initializingFlow.set(null);\r
                        }\r
-               }\r
-               else {\r
+               } else {\r
                        // happens for flows imported as services\r
                        log.warn("flowInitializationFinished - Flow Stack is null");\r
                }\r