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

bean factory -> application context

Browse Source
This commit is contained in:
Keith Donald
2008-04-02 21:23:14 +00:00
parent 3842ea242c
commit cb10158602
30 changed files with 299 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-faces/src/main/java/org/springframework/faces/webflow/SpringBeanWebFlowVariableResolver.java
View File

@@ -23,12 +23,11 @@ public class SpringBeanWebFlowVariableResolver extends SpringBeanVariableResolve
protected BeanFactory getBeanFactory(FacesContext facesContext) {
RequestContext requestContext = RequestContextHolder.getRequestContext();
if (requestContext != null && requestContext.getActiveFlow().getBeanFactory() != null) {
BeanFactory factory = requestContext.getActiveFlow().getBeanFactory();
return factory;
} else {
if (requestContext == null) {
return EMPTY_BEAN_FACTORY;
}
BeanFactory beanFactory = requestContext.getActiveFlow().getApplicationContext();
return beanFactory != null ? beanFactory : EMPTY_BEAN_FACTORY;
}
}