Ignore files

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
index e9c3c481c68fd65269e5b0885a1df35b03e57433..b50b78f512d35c2f81ba35da24bb2465bd624bf5 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
@@ -47,12 +46,12 @@ public class ExecutionAspect {
                executionContext.setVariable(ExecutionContext.VAR_FLOW_NAME,
                                executionFlow.getName());
 
-               logStackEvent("=> ", executionFlow, false);
+               logStackEvent("=> ", executionFlow);
                try {
                        // Actually execute the flow
                        pjp.proceed();
                } finally {
-                       logStackEvent("<= ", executionFlow, true);
+                       logStackEvent("<= ", executionFlow);
                        executionStack.leaveFlow(executionFlow);
                }
        }
@@ -85,18 +84,14 @@ public class ExecutionAspect {
                this.executionContext = executionContext;
        }
 
-       protected void logStackEvent(String symbol, ExecutionFlow executionFlow,
-                       Boolean trace) {
+       protected void logStackEvent(String symbol, ExecutionFlow executionFlow) {
                Integer stackSize = executionStack.getStackSize();
                if (log.isTraceEnabled())
                        log.debug(depthSpaces(stackSize) + symbol + executionFlow + " #"
                                        + executionStack.getCurrentStackLevelUuid() + ", depth="
                                        + stackSize);
-               else if (log.isDebugEnabled() && !trace)
+               if (log.isDebugEnabled())
                        log.debug(depthSpaces(stackSize) + symbol + executionFlow);
-               else if (log.isTraceEnabled() && trace)
-                       log.trace(depthSpaces(stackSize) + symbol + executionFlow);
-
        }
 
        protected void logRunnableExecution(ExecutionFlow executionFlow,