X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionAspect.java;h=b50b78f512d35c2f81ba35da24bb2465bd624bf5;hb=d1298659fe6f179d1cbbc8c89f108a0bbc5b4edf;hp=e9c3c481c68fd65269e5b0885a1df35b03e57433;hpb=32f9566efa0d0ce29b31ee0779faf2b42f46321a;p=gpl%2Fargeo-slc.git

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 e9c3c481c..b50b78f51 100644
--- 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,