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=8c588d3128b3885ac4fe0a0d2fbd358640d336a5;hp=d31c14847a79bd8b73ffc7c292938e3ac7966781;hpb=a18184e7d6bb5cc2cd6763439310061c60a00a78;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 d31c14847..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,3 +1,18 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * 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;
@@ -11,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);
 
@@ -30,24 +46,14 @@ public class ExecutionAspect {
 		executionContext.setVariable(ExecutionContext.VAR_FLOW_NAME,
 				executionFlow.getName());
 
-		if (log.isDebugEnabled())
-			logStackEvent("=> ", executionFlow);
-		// Actually execute the flow
-		pjp.proceed();
-		if (log.isDebugEnabled())
+		logStackEvent("=> ", executionFlow);
+		try {
+			// Actually execute the flow
+			pjp.proceed();
+		} finally {
 			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();
+			executionStack.leaveFlow(executionFlow);
+		}
 	}
 
 	@Around("getVariable()")
@@ -66,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() {
 	}
@@ -84,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) {