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=0c6864f440fccf7aab7fbd7b346c1eaf5a32c3b0;hb=31a8055cac622a55afd2668e77f00aba1d031f91;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..0c6864f44 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
@@ -15,6 +15,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 +92,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 +122,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) {