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

factored out getContext()

Browse Source
This commit is contained in:
Keith Donald
2008-01-14 23:25:51 +00:00
parent 3e99a26b8e
commit 9191964523
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java
View File

@@ -75,13 +75,7 @@ class OgnlExpression implements Expression {
public Object getValue(Object target) throws EvaluationException {
Assert.notNull(target, "The target object to evaluate is required");
try {
Map context;
if (variables != null && variables.length > 0) {
context = new HashMap(variables.length);
} else {
context = Collections.EMPTY_MAP;
}
return Ognl.getValue(expression, context, target);
return Ognl.getValue(expression, getContext(), target);
} catch (OgnlException e) {
if (e.getReason() != null && e.getReason() != e) {
// unwrap the OgnlException since the actual exception is wrapped inside it
@@ -97,12 +91,20 @@ class OgnlExpression implements Expression {
Assert.notNull(target, "The target object to evaluate is required");
try {
// TODO context map
Ognl.setValue(expression, Collections.EMPTY_MAP, target, value);
Ognl.setValue(expression, getContext(), target, value);
} catch (OgnlException e) {
throw new EvaluationException(new SetValueAttempt(this, target, value), e);
}
}
private Map getContext() {
if (variables != null && variables.length > 0) {
return new HashMap(variables.length);
} else {
return Collections.EMPTY_MAP;
}
}
public String toString() {
return expression.toString();
}