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

AbstractMessageSource properly interacts with non-AbstractMessageSource parent

Browse Source 
Issue: SPR-16047
This commit is contained in:
Juergen Hoeller
2017-10-18 20:21:12 +02:00
parent 950edf888a
commit c3378fda33
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java
View File

@@ -263,7 +263,9 @@ public abstract class AbstractMessageSource extends MessageSourceSupport impleme
}
else {
// Check parent MessageSource, returning null if not found there.
return parent.getMessage(code, args, null, locale);
// Covers custom MessageSource impls and DelegatingMessageSource.
String msg = parent.getMessage(code, args, null, locale);
return ("".equals(msg) ? null : msg);
}
}
// Not found in parent either.