From 93e499332df98eb2323fa7fc1c87a981651a24d9 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 22 Jun 2017 16:42:20 -0400 Subject: [PATCH] Adapt to AbstractMessageSource null -> "" change AbstractMessageSource#getMessage now returns "" instead of null and FlowResourceELResolver needs to change accordingly in order to give other resolvers a chance. --- .../webflow/expression/el/FlowResourceELResolver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 e491692a..2c085900 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 @@ -9,6 +9,7 @@ import javax.el.ELResolver; import javax.el.PropertyNotWritableException; import org.springframework.context.MessageSource; +import org.springframework.util.StringUtils; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; @@ -57,7 +58,7 @@ public class FlowResourceELResolver extends ELResolver { } else if (base instanceof MessageSource) { MessageSource messageSource = (MessageSource) base; String message = messageSource.getMessage(property.toString(), null, null, getLocale()); - if (message != null) { + if (StringUtils.hasText(message)) { context.setPropertyResolved(true); return String.class; } @@ -76,7 +77,7 @@ public class FlowResourceELResolver extends ELResolver { } else if (base instanceof MessageSource) { MessageSource messageSource = (MessageSource) base; String message = messageSource.getMessage(property.toString(), null, null, getLocale()); - if (message != null) { + if (StringUtils.hasText(message)) { context.setPropertyResolved(true); return message; }