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=6de9c4036be9e318f59a0ffa187570f5999c53cb;hp=09e2afe5b66acfac0bef30becbdf9c5acde3ce24;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;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 09e2afe5b..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;
@@ -27,6 +26,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 
 @Aspect
+/** Aspect intercepting calls on execution flows and contexts. */
 public class ExecutionAspect {
 	private final static Log log = LogFactory.getLog(ExecutionAspect.class);
 
@@ -46,30 +46,16 @@ public class ExecutionAspect {
 		executionContext.setVariable(ExecutionContext.VAR_FLOW_NAME,
 				executionFlow.getName());
 
-		if (log.isDebugEnabled())
-			logStackEvent("=> ", executionFlow);
-		
+		logStackEvent("=> ", executionFlow);
 		try {
 			// Actually execute the flow
 			pjp.proceed();
 		} finally {
-			if (log.isDebugEnabled())
-				logStackEvent("<= ", executionFlow);
-	
+			logStackEvent("<= ", executionFlow);
 			executionStack.leaveFlow(executionFlow);
 		}
 	}
 
-	@Around("runnableExecution()")
-	public void aroundRunnable(ProceedingJoinPoint pjp) throws Throwable {
-		ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
-		Runnable runnable = (Runnable) pjp.getArgs()[0];
-		if (log.isDebugEnabled())
-			logRunnableExecution(executionFlow, runnable);
-		// Actually execute the runnable
-		pjp.proceed();
-	}
-
 	@Around("getVariable()")
 	public Object aroundGetVariable(ProceedingJoinPoint pjp) throws Throwable {
 		Object obj = pjp.proceed();
@@ -86,10 +72,6 @@ public class ExecutionAspect {
 	public void flowExecution() {
 	}
 
-	@Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.doExecuteRunnable(..))")
-	public void runnableExecution() {
-	}
-
 	@Pointcut("execution(* org.argeo.slc.execution.ExecutionContext.getVariable(..))")
 	public void getVariable() {
 	}
@@ -104,16 +86,21 @@ public class ExecutionAspect {
 
 	protected void logStackEvent(String symbol, ExecutionFlow executionFlow) {
 		Integer stackSize = executionStack.getStackSize();
-		log.debug(depthSpaces(stackSize) + symbol + executionFlow + " #"
-				+ executionStack.getCurrentStackLevelUuid() + ", depth="
-				+ stackSize);
+		if (log.isTraceEnabled())
+			log.debug(depthSpaces(stackSize) + symbol + executionFlow + " #"
+					+ executionStack.getCurrentStackLevelUuid() + ", depth="
+					+ stackSize);
+		if (log.isDebugEnabled())
+			log.debug(depthSpaces(stackSize) + symbol + executionFlow);
 	}
 
 	protected void logRunnableExecution(ExecutionFlow executionFlow,
 			Runnable runnable) {
 		Integer stackSize = executionStack.getStackSize();
-		log.debug(depthSpaces(stackSize + 1)
-				+ runnable.getClass().getSimpleName() + " in " + executionFlow);
+		if (log.isDebugEnabled())
+			log.debug(depthSpaces(stackSize + 1)
+					+ runnable.getClass().getSimpleName() + " in "
+					+ executionFlow);
 	}
 
 	private String depthSpaces(int depth) {