From a7d3eeb662bbc7e6ab89041d2ec85cf63ead311a Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Sat, 8 Mar 2008 05:19:35 +0000 Subject: [PATCH] fixed shadowing bug --- .../expression/el/SpringBeanWebFlowELResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/SpringBeanWebFlowELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/SpringBeanWebFlowELResolver.java index dd3aa42e..7fedd4ed 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/SpringBeanWebFlowELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/SpringBeanWebFlowELResolver.java @@ -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(); } }