From 608554c8bb4a5792f65bad7a5deb46651ddd2143 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 27 Jun 2011 16:01:32 +0000 Subject: [PATCH] Simplify. Covert aliases to lower case too. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140219 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/buf/B2CConverter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java index af3a8916f..4b6e15e3a 100644 --- a/java/org/apache/tomcat/util/buf/B2CConverter.java +++ b/java/org/apache/tomcat/util/buf/B2CConverter.java @@ -24,7 +24,6 @@ import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.util.Locale; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.apache.tomcat.util.res.StringManager; @@ -53,12 +52,12 @@ public class B2CConverter { new ConcurrentHashMap(); static { - for (Entry entry : - Charset.availableCharsets().entrySet()) { - Charset charset = entry.getValue(); - encodingToCharsetCache.put(entry.getKey().toLowerCase(), charset); + for (Charset charset: Charset.availableCharsets().values()) { + encodingToCharsetCache.put( + charset.name().toLowerCase(Locale.US), charset); for (String alias : charset.aliases()) { - encodingToCharsetCache.put(alias, charset); + encodingToCharsetCache.put( + alias.toLowerCase(Locale.US), charset); } } } -- 2.11.0