spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-07 15:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Align fallback implementation with AbstractMessageSource

Browse Source 
Closes gh-37383
This commit is contained in:
Juergen Hoeller
2026-10-05 17:20:45 +02:00
parent ee1aac605b
commit 08e8408b45
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/context/support/DelegatingMessageSource.java
+9 -2
View File
@@ -86,8 +86,15 @@ public class DelegatingMessageSource extends MessageSourceSupport implements Hie
return this.parentMessageSource.getMessage(resolvable, locale);
}
else {
if (resolvable.getDefaultMessage() != null) {
return renderDefaultMessage(resolvable.getDefaultMessage(), resolvable.getArguments(), locale);
String defaultMessage = resolvable.getDefaultMessage();
if (defaultMessage != null) {
if (resolvable instanceof DefaultMessageSourceResolvable defaultMessageSourceResolvable &&
!defaultMessageSourceResolvable.shouldRenderDefaultMessage()) {
// Given default message does not contain any argument placeholders
// (and isn't escaped for alwaysUseMessageFormat either) -> return as-is.
return defaultMessage;
}
return renderDefaultMessage(defaultMessage, resolvable.getArguments(), locale);
}
String[] codes = resolvable.getCodes();
String code = (codes != null && codes.length > 0 ? codes[0] : "");