Improve execution core

[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 d31c14847a79bd8b73ffc7c292938e3ac7966781..6d0b9a64e5ad3bbf064c992b84b15e9ee427f2a9 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
@@ -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()")