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

SWF-976 - SimpleELContext is not thread-safe

Browse Source
This commit is contained in:
Jeremy Grelle
2008-12-10 20:55:28 +00:00
parent 0b76f08488
commit 57199c5d7e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java
View File

@@ -30,14 +30,15 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
private PropertyResolver nextResolver;
private ELContext elContext;
private ELResolver delegate;
public ELDelegatingPropertyResolver(PropertyResolver nextResolver, ELResolver delegate) {
this.nextResolver = nextResolver;
this.elContext = new SimpleELContext(delegate);
this.delegate = delegate;
}
public Class getType(Object base, int index) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
Class type = elContext.getELResolver().getType(elContext, base, new Integer(index));
if (elContext.isPropertyResolved()) {
return type;
@@ -47,6 +48,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public Class getType(Object base, Object property) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
Class type = elContext.getELResolver().getType(elContext, base, property);
if (elContext.isPropertyResolved()) {
return type;
@@ -56,6 +58,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public Object getValue(Object base, int index) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
Object value = elContext.getELResolver().getValue(elContext, base, new Integer(index));
if (elContext.isPropertyResolved()) {
return value;
@@ -65,6 +68,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public Object getValue(Object base, Object property) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
Object value = elContext.getELResolver().getValue(elContext, base, property);
if (elContext.isPropertyResolved()) {
return value;
@@ -74,6 +78,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public boolean isReadOnly(Object base, int index) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
boolean readOnly = elContext.getELResolver().isReadOnly(elContext, base, new Integer(index));
if (elContext.isPropertyResolved()) {
return readOnly;
@@ -83,6 +88,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public boolean isReadOnly(Object base, Object property) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
boolean readOnly = elContext.getELResolver().isReadOnly(elContext, base, property);
if (elContext.isPropertyResolved()) {
return readOnly;
@@ -92,6 +98,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
}
public void setValue(Object base, int index, Object value) throws EvaluationException, PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
elContext.getELResolver().setValue(elContext, base, new Integer(index), value);
if (!elContext.isPropertyResolved()) {
nextResolver.setValue(base, index, value);
@@ -100,6 +107,7 @@ public abstract class ELDelegatingPropertyResolver extends PropertyResolver {
public void setValue(Object base, Object property, Object value) throws EvaluationException,
PropertyNotFoundException {
ELContext elContext = new SimpleELContext(delegate);
elContext.getELResolver().setValue(elContext, base, property, value);
if (!elContext.isPropertyResolved()) {
nextResolver.setValue(base, property, value);

5
spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java
View File

@@ -30,14 +30,15 @@ public abstract class ELDelegatingVariableResolver extends VariableResolver {
private VariableResolver nextResolver;
private ELContext elContext;
private ELResolver delegate;
public ELDelegatingVariableResolver(VariableResolver nextResolver, ELResolver delegate) {
this.nextResolver = nextResolver;
this.elContext = new SimpleELContext(delegate);
this.delegate = delegate;
}
public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException {
ELContext elContext = new SimpleELContext(delegate);
Object result = elContext.getELResolver().getValue(elContext, null, name);
if (elContext.isPropertyResolved()) {
return result;