ActiveMQ and Castor integration

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

diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java
index db8af23d5d76657665cf19991335bde8a38da69c..c6d8e2c338e686fa426e1362cb45027635797538 100644 (file)
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java
@@ -52,7 +52,7 @@ public class ExecutionContext {
                ExecutionFlowRuntime runtime = new ExecutionFlowRuntime(executionFlow);
                stack.push(runtime);
 
-               if (log.isTraceEnabled())
+               if (log.isDebugEnabled())
                        log.debug(depthSpaces(stack.size()) + "=> " + executionFlow + " #"
                                        + getCurrentStackUuid() + ", depth=" + stack.size());
 
@@ -105,13 +105,13 @@ public class ExecutionContext {
 
        public static void leaveFlow(ExecutionFlow executionFlow) {
                Stack<ExecutionFlowRuntime> stack = executionContext.get().stack;
-               if (log.isTraceEnabled())
+               if (log.isDebugEnabled())
                        log.debug(depthSpaces(stack.size()) + "<= " + executionFlow + " #"
                                        + getCurrentStackUuid() + ", depth=" + stack.size());
 
                ExecutionFlowRuntime leftEf = stack.pop();
-               if (!leftEf.getExecutionFlow().getUuid()
-                               .equals(executionFlow.getUuid()))
+               if (!leftEf.getExecutionFlow().getName()
+                               .equals(executionFlow.getName()))
                        throw new SlcException("Asked to leave " + executionFlow
                                        + " but last is " + leftEf);