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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
This commit is contained in:
Sam Brannen
2022-06-03 13:35:22 +02:00
parent 4191958e00 e2767371b5
commit 73acab7635
10 changed files with 99 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,9 +37,9 @@ public class SimpleLocaleContext implements LocaleContext {
/**
* Create a new SimpleLocaleContext that exposes the specified Locale.
* Every {@link #getLocale()} call will return this Locale.
* @param locale the Locale to expose, or {@code null} for no specific one
* Create a new {@code SimpleLocaleContext} that exposes the specified {@link Locale}.
* <p>Every {@link #getLocale()} call will return this locale.
* @param locale the {@code Locale} to expose, or {@code null} for no specific one
*/
public SimpleLocaleContext(@Nullable Locale locale) {
this.locale = locale;