From 8d9191310856917d91b772a5e9ef9633a052ff7e Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Fri, 8 Dec 2023 11:40:17 -0600 Subject: [PATCH] fix TestCharsetCache --- java/org/apache/tomcat/util/buf/CharsetCache.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/buf/CharsetCache.java b/java/org/apache/tomcat/util/buf/CharsetCache.java index 4474bee3c914..b26033bb1fb1 100644 --- a/java/org/apache/tomcat/util/buf/CharsetCache.java +++ b/java/org/apache/tomcat/util/buf/CharsetCache.java @@ -153,7 +153,9 @@ public class CharsetCache { // Added from OpenJDK 15 ea24 "iso8859_16", // Added from HPE JVM 1.8.0.17-hp-ux - "cp1051", "cp1386", "cshproman8", "hp-roman8", "ibm-1051", "r8", "roman8", "roman9" + "cp1051", "cp1386", "cshproman8", "hp-roman8", "ibm-1051", "r8", "roman8", "roman9", + // Added from OpenJDK 21 ea18 + "gb18030-2022" // If you add and entry to this list, ensure you run // TestCharsetUtil#testIsAcsiiSupersetAll() };