X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlowDescriptorConverter.java;fp=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlowDescriptorConverter.java;h=9b3764b8af08550affccd9b777277136d0957a31;hb=aee87eeef820af87f18c2cf2e9b86b612393f7db;hp=2fb897d3a988b6eec9a5512b0da93cc688e76650;hpb=c3483ee56ab0083c5be7636c500963dffdc058a3;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index 2fb897d3a..9b3764b8a 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -35,6 +35,7 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -217,8 +218,11 @@ public class DefaultExecutionFlowDescriptorConverter implements
 			efd.setPath("");
 
 		// Takes description from spring
-		BeanDefinition bd = getBeanFactory().getBeanDefinition(name);
-		efd.setDescription(bd.getDescription());
+		BeanFactory bf = getBeanFactory();
+		if (bf != null) {
+			BeanDefinition bd = getBeanFactory().getBeanDefinition(name);
+			efd.setDescription(bd.getDescription());
+		}
 		return efd;
 	}
 
@@ -292,7 +296,10 @@ public class DefaultExecutionFlowDescriptorConverter implements
 		}
 	}
 
+	/** @return can be null */
 	private ConfigurableListableBeanFactory getBeanFactory() {
+		if (applicationContext == null)
+			return null;
 		return ((ConfigurableApplicationContext) applicationContext)
 				.getBeanFactory();
 	}