From b7d7688c4cae1b086065de6ea5ef5e7e058c8e16 Mon Sep 17 00:00:00 2001 From: Andre Blanke Date: Thu, 30 May 2024 13:48:17 +0200 Subject: [PATCH] Use getMessageSource internally in RequestContext --- .../springframework/web/servlet/support/RequestContext.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index 0cde30bf4ee7..d9d441e6c3a8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -661,7 +661,7 @@ public String getMessage(String code, @Nullable List args, String defaultMess * @return the message */ public String getMessage(String code, @Nullable Object[] args, String defaultMessage, boolean htmlEscape) { - String msg = this.webApplicationContext.getMessage(code, args, defaultMessage, getLocale()); + String msg = getMessageSource().getMessage(code, args, defaultMessage, getLocale()); if (msg == null) { return ""; } @@ -709,7 +709,7 @@ public String getMessage(String code, @Nullable List args) throws NoSuchMessa * @throws org.springframework.context.NoSuchMessageException if not found */ public String getMessage(String code, @Nullable Object[] args, boolean htmlEscape) throws NoSuchMessageException { - String msg = this.webApplicationContext.getMessage(code, args, getLocale()); + String msg = getMessageSource().getMessage(code, args, getLocale()); return (htmlEscape ? HtmlUtils.htmlEscape(msg) : msg); } @@ -731,7 +731,7 @@ public String getMessage(MessageSourceResolvable resolvable) throws NoSuchMessag * @throws org.springframework.context.NoSuchMessageException if not found */ public String getMessage(MessageSourceResolvable resolvable, boolean htmlEscape) throws NoSuchMessageException { - String msg = this.webApplicationContext.getMessage(resolvable, getLocale()); + String msg = getMessageSource().getMessage(resolvable, getLocale()); return (htmlEscape ? HtmlUtils.htmlEscape(msg) : msg); }