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

fixed shadowing bug

Browse Source
This commit is contained in:
Keith Donald
2008-03-08 05:19:35 +00:00
parent 47f94dd262
commit a7d3eeb662
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflow/src/main/java/org/springframework/webflow/expression/el/SpringBeanWebFlowELResolver.java
View File

@@ -16,18 +16,18 @@ public class SpringBeanWebFlowELResolver extends SpringBeanELResolver {
private static final BeanFactory EMPTY_BEAN_FACTORY = new StaticListableBeanFactory();
private RequestContext context;
private RequestContext requestContext;
public SpringBeanWebFlowELResolver() {
}
public SpringBeanWebFlowELResolver(RequestContext context) {
this.context = context;
this.requestContext = context;
}
protected BeanFactory getBeanFactory(ELContext elContext) {
RequestContext requestContext = getRequestContext();
if (context != null && requestContext.getActiveFlow().getBeanFactory() != null) {
if (requestContext != null && requestContext.getActiveFlow().getBeanFactory() != null) {
BeanFactory factory = requestContext.getActiveFlow().getBeanFactory();
return factory;
} else {
@@ -36,7 +36,7 @@ public class SpringBeanWebFlowELResolver extends SpringBeanELResolver {
}
protected RequestContext getRequestContext() {
return context != null ? context : RequestContextHolder.getRequestContext();
return requestContext != null ? requestContext : RequestContextHolder.getRequestContext();
}
}