Repository: wicket Updated Branches: refs/heads/master 0f8a6d757 -> ad0cdb01e
No need of concurrency in ResourceUtils#isoLanguages/isoCountries. We just read from them Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad0cdb01 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad0cdb01 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad0cdb01 Branch: refs/heads/master Commit: ad0cdb01ea203e25a46a226e8bf915691ec94039 Parents: 0f8a6d7 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Sep 23 13:56:04 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Sep 23 13:56:04 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/resource/ResourceUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ad0cdb01/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java index 3216707..a51f359 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java @@ -17,12 +17,12 @@ package org.apache.wicket.util.resource; import java.util.Arrays; +import java.util.HashSet; import java.util.Locale; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.wicket.util.collections.ConcurrentHashSet; import org.apache.wicket.util.string.Strings; /** @@ -33,10 +33,10 @@ public class ResourceUtils { private static final Pattern LOCALE_PATTERN = Pattern.compile("_([a-z]{2})(_([A-Z]{2})(_([^_]+))?)?$"); - private final static Set<String> isoCountries = new ConcurrentHashSet<>( + private final static Set<String> isoCountries = new HashSet<>( Arrays.asList(Locale.getISOCountries())); - private final static Set<String> isoLanguages = new ConcurrentHashSet<>( + private final static Set<String> isoLanguages = new HashSet<>( Arrays.asList(Locale.getISOLanguages())); /**
