From efb4d493e47978402398d8da1a6106f996b5019d Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 14 Nov 2008 14:42:14 +0000 Subject: [PATCH] consistent isReadOnly / setValue --- .../webflow/expression/el/FlowResourceELResolver.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/FlowResourceELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/FlowResourceELResolver.java index 208631f5..fcbf801a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/expression/el/FlowResourceELResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/el/FlowResourceELResolver.java @@ -85,7 +85,7 @@ public class FlowResourceELResolver extends ELResolver { public boolean isReadOnly(ELContext context, Object base, Object property) { RequestContext requestContext = getRequestContext(); - if (base != null || requestContext == null) { + if (requestContext == null) { return false; } if (base == null && RESOURCE_BUNDLE_KEY.equals(property)) { @@ -100,11 +100,12 @@ public class FlowResourceELResolver extends ELResolver { public void setValue(ELContext context, Object base, Object property, Object value) { RequestContext requestContext = getRequestContext(); - if (base != null || requestContext == null) { + if (requestContext == null) { return; } if (base == null && RESOURCE_BUNDLE_KEY.equals(property)) { - throw new PropertyNotWritableException("The flow's MessageSource is not writable."); + throw new PropertyNotWritableException("The '" + RESOURCE_BUNDLE_KEY + + "' implicit variable is not writable."); } else if (base instanceof MessageSource) { throw new PropertyNotWritableException("The flow's MessageSource is not writable."); }