StringUtils.parseLocale consistently handles invalid locale values

Closes gh-22603
2019-03-25 13:53:54 +01:00
parent 8d7676a5ec
commit 507d4ba825
2 changed files with 20 additions and 2 deletions
--- a/spring-core/src/main/java/org/springframework/util/StringUtils.java
+++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java
@@ -774,7 +774,9 @@ public abstract class StringUtils {
 		if (tokens.length == 1) {
 			validateLocalePart(localeValue);
 			Locale resolved = Locale.forLanguageTag(localeValue);
-			return (resolved.getLanguage().length() > 0 ? resolved : null);
+			if (resolved.getLanguage().length() > 0) {
+				return resolved;
+			}
 		}
 		return parseLocaleTokens(localeValue, tokens);
 	}