X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlow.java;h=bf1cf99a5f5efc8e3b3da117407ce58c831b0537;hb=3781dcd363f0f6265fae0ac758fd40cf4254ebc9;hp=c24ade0a30032c866b1d859e9f76c391ee5f146a;hpb=cd5ecf6b79eea687ac472d53245450429e9ef4a8;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index c24ade0a3..bf1cf99a5 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.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 java.util.ArrayList;
@@ -15,6 +31,7 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.structure.StructureAware;
 import org.argeo.slc.structure.StructureRegistry;
+import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
@@ -91,7 +108,7 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 	public void run() {
 		try {
 			for (Runnable executable : executables) {
-				doExecuteRunnable(executable);
+				this.doExecuteRunnable(executable);
 			}
 		} catch (RuntimeException e) {
 			if (failOnError)
@@ -121,7 +138,8 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
 
 		if (path != null) {
 			for (Runnable executable : executables) {
-				if (executable instanceof StructureAware) {
+				if (executable instanceof StructureAware
+						&& !(executable instanceof ScopedObject)) {
 					((StructureAware<TreeSPath>) executable).notifyCurrentPath(
 							registry, new TreeSPath(path));
 				} else if (executable instanceof DefaultExecutionFlow) {