Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression after GenericApplicationContext change

Browse Source 
Issue: SWF-1713
This commit is contained in:
Rossen Stoyanchev
2017-12-15 14:36:12 -05:00
parent a92a6847c2
commit 40af09dfac
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java
View File

@@ -346,13 +346,21 @@ public class FlowModelFlowBuilder extends AbstractFlowBuilder {
flowContext.getBeanFactory().registerScope("view", new ViewScope()); flowContext.getBeanFactory().registerScope("view", new ViewScope());
flowContext.getBeanFactory().registerScope("flow", new FlowScope()); flowContext.getBeanFactory().registerScope("flow", new FlowScope());
flowContext.getBeanFactory().registerScope("conversation", new ConversationScope()); flowContext.getBeanFactory().registerScope("conversation", new ConversationScope());
// Ensure the current ClassLoader is used, or otherwise setting the ResourceLoader would suppress it
ClassLoader classLoaderToUse = flowContext.getClassLoader();
flowContext.setClassLoader(classLoaderToUse);
Resource flowResource = flowModelHolder.getFlowModelResource(); Resource flowResource = flowModelHolder.getFlowModelResource();
flowContext.setResourceLoader(new FlowRelativeResourceLoader(flowResource)); flowContext.setResourceLoader(new FlowRelativeResourceLoader(flowResource));
AnnotationConfigUtils.registerAnnotationConfigProcessors(flowContext); AnnotationConfigUtils.registerAnnotationConfigProcessors(flowContext);
new XmlBeanDefinitionReader(flowContext).loadBeanDefinitions(resources); new XmlBeanDefinitionReader(flowContext).loadBeanDefinitions(resources);
registerFlowBeans(flowContext.getBeanFactory()); registerFlowBeans(flowContext.getBeanFactory());
registerMessageSource(flowContext, flowResource); registerMessageSource(flowContext, flowResource);
flowContext.refresh(); flowContext.refresh();
return flowContext; return flowContext;
} }