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=6d0b9a64e5ad3bbf064c992b84b15e9ee427f2a9;hb=31a8055cac622a55afd2668e77f00aba1d031f91;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..6d0b9a64e 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
@@ -32,12 +32,16 @@ public class ExecutionAspect {
 
 		if (log.isDebugEnabled())
 			logStackEvent("=> ", executionFlow);
-		// Actually execute the flow
-		pjp.proceed();
-		if (log.isDebugEnabled())
-			logStackEvent("<= ", executionFlow);
-
-		executionStack.leaveFlow(executionFlow);
+		
+		try {
+			// Actually execute the flow
+			pjp.proceed();
+		} finally {
+			if (log.isDebugEnabled())
+				logStackEvent("<= ", executionFlow);
+	
+			executionStack.leaveFlow(executionFlow);
+		}
 	}
 
 	@Around("runnableExecution()")