From 40af09dfacaa0a1ae7bdb3f5ef77a6a1bd46c8be Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 15 Dec 2017 14:36:12 -0500 Subject: [PATCH] Fix regression after GenericApplicationContext change Issue: SWF-1713 --- .../engine/builder/model/FlowModelFlowBuilder.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java index 9bf9002d..33debf78 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java @@ -346,13 +346,21 @@ public class FlowModelFlowBuilder extends AbstractFlowBuilder { flowContext.getBeanFactory().registerScope("view", new ViewScope()); flowContext.getBeanFactory().registerScope("flow", new FlowScope()); 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(); flowContext.setResourceLoader(new FlowRelativeResourceLoader(flowResource)); + AnnotationConfigUtils.registerAnnotationConfigProcessors(flowContext); new XmlBeanDefinitionReader(flowContext).loadBeanDefinitions(resources); registerFlowBeans(flowContext.getBeanFactory()); registerMessageSource(flowContext, flowResource); + flowContext.refresh(); + return flowContext; }