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

Getting booking-faces back in working order. The build is going to break because of one of Keith's tests that I'm going to let him fix.

Browse Source
This commit is contained in:
Jeremy Grelle
2008-03-06 00:16:36 +00:00
parent ae5abe1f41
commit c0fb6c0b98
23 changed files with 487 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
View File

@@ -35,7 +35,11 @@ public class ELExpression implements Expression {
public Object getValue(Object context) throws EvaluationException {
ELContext ctx = elContextFactory.getELContext(context);
try {
return valueExpression.getValue(ctx);
Object result = valueExpression.getValue(ctx);
if (result == null && !ctx.isPropertyResolved()) {
throw new EvaluationException(new EvaluationAttempt(this, context), null);
}
return result;
} catch (ELException ex) {
throw new EvaluationException(new EvaluationAttempt(this, context), ex);
}
@@ -45,6 +49,9 @@ public class ELExpression implements Expression {
ELContext ctx = elContextFactory.getELContext(context);
try {
valueExpression.setValue(ctx, value);
if (!ctx.isPropertyResolved()) {
throw new EvaluationException(new EvaluationAttempt(this, context), null);
}
} catch (ELException ex) {
throw new EvaluationException(new EvaluationAttempt(this, context), ex);
}