Do not use path anymore in as-flow

[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..09e2afe5b66acfac0bef30becbdf9c5acde3ce24 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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;
@@ -32,12 +48,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()")