[JBEAP-20946] Do not register unsupported Java charset names

jboss · Feb 3, 2021 · 9f3b1d1 · 9f3b1d1
1 parent 8cd0c15
commit 9f3b1d1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/org/apache/xml/serializer/Encodings.java b/src/org/apache/xml/serializer/Encodings.java
@@ -25,6 +25,7 @@
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -340,6 +341,9 @@ private static EncodingInfo[] loadEncodingInfo()
             for (int i = 0; i < totalEntries; ++i)
             {
                 String javaName = (String) keys.nextElement();
+                if (!Charset.isSupported(javaName)) {
+                    continue; // Not all JDKs support all encodings specified in our config
+                }
                 String val = props.getProperty(javaName);
                 int len = lengthOfMimeNames(val);