Need to include aliases in charset cache

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140204 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java
index 4338994..af3a891 100644 (file)
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -55,8 +55,11 @@ public class B2CConverter {
     static {
         for (Entry<String,Charset> entry :
                 Charset.availableCharsets().entrySet()) {
-            encodingToCharsetCache.put(entry.getKey().toLowerCase(),
-                    entry.getValue());
+            Charset charset = entry.getValue(); 
+            encodingToCharsetCache.put(entry.getKey().toLowerCase(), charset);
+            for (String alias : charset.aliases()) {
+                encodingToCharsetCache.put(alias, charset);
+            }
         }
     }