X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionScope.java;h=a24046a99869a443f4fb024de4a5aff5875599e3;hb=9c82ed02a7ee7b4a757853d8160587b27e493f1a;hp=36d951093a964c18b68fea9f0348a089e1f553ac;hpb=c7f0b5fc6a3c66e2d7de7b37f0ed4983b4a16006;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
index 36d951093..a24046a99 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
@@ -27,9 +27,27 @@ public class ExecutionScope implements Scope {
 			// if not, we expect objectFactory to produce an ExecutionContext
 			Object obj = objectFactory.getObject();
 			if (obj instanceof ExecutionContext) {
+				// Check whether we are in an execution
+				// FIXME: do it more properly (not static)
+				// see https://www.argeo.org/bugzilla/show_bug.cgi?id=82
+				if (!ExecutionAspect.inModuleExecution.get()) {
+					log
+							.error("An execution context is being instantiated outside a module execution."
+									+ " Please check your references to execution contexts."
+									+ " This may lead to unexpected behaviour and will be rejected in the future.");
+					//Thread.dumpStack();
+				}
+
 				// store the ExecutionContext in the ThreadLocal
 				executionContext.set((ExecutionContext) obj);
 				executionContextBeanName.set(name);
+				if (log.isDebugEnabled()) {
+					log.debug("Execution context #"
+							+ executionContext.get().getUuid()
+							+ " instantiated. (beanName="
+							+ executionContextBeanName.get() + ")");
+					// Thread.dumpStack();
+				}
 				return obj;
 			} else {
 				throw new SlcException(