merged branches/TREQ_1_0_X r1598921
git-svn-id: https://svn.apache.org/repos/asf/tiles/request/trunk@1598922 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java b/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java
index fa9a2ab..38253c2 100644
--- a/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java
+++ b/tiles-request-api/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java
@@ -22,7 +22,9 @@
package org.apache.tiles.request.locale;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.Locale;
import org.apache.tiles.request.ApplicationResource;
import org.slf4j.Logger;
@@ -243,9 +245,9 @@
}
*/
- private static Locale validateLocale(Locale locale) {
- List<Locale> availableLocales = Arrays.asList(Locale.getAvailableLocales());
+ private static Set<Locale> availableLocales = new HashSet<Locale>(Arrays.asList(Locale.getAvailableLocales()));
+ private static Locale validateLocale(Locale locale) {
Locale withoutVariant = locale.getVariant().isEmpty()
? locale
: new Locale(locale.getLanguage(), locale.getCountry());