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

Adapt to AbstractMessageSource null -> "" change

Browse Source 
AbstractMessageSource#getMessage now returns "" instead of null and
FlowResourceELResolver needs to change accordingly in order to give
other resolvers a chance.
This commit is contained in:
Rossen Stoyanchev
2017-06-22 16:42:20 -04:00
parent ee6c0b0e13
commit 93e499332d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflow/src/main/java/org/springframework/webflow/expression/el/FlowResourceELResolver.java
View File

@@ -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;
}