From e7f89f87c14bb65a83518508a791dc68e681ddd4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 25 Oct 2013 18:25:43 -0700 Subject: [PATCH] Fix off-by-one error in parseLocaleString Fix off-by-one error in StringUtils.parseLocaleString() Issue: SPR-10364 --- .../src/main/java/org/springframework/util/StringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-core/src/main/java/org/springframework/util/StringUtils.java b/spring-core/src/main/java/org/springframework/util/StringUtils.java index c1c9d7d245..8a185a91ca 100644 --- a/spring-core/src/main/java/org/springframework/util/StringUtils.java +++ b/spring-core/src/main/java/org/springframework/util/StringUtils.java @@ -688,7 +688,7 @@ public abstract class StringUtils { validateLocalePart(language); validateLocalePart(country); String variant = ""; - if (parts.length >= 2) { + if (parts.length > 2) { // There is definitely a variant, and it is everything after the country // code sans the separator between the country code and the variant. int endIndexOfCountryCode = localeString.lastIndexOf(country) + country.length();