From c19bf5ef498a66ba52e3796bf202612fedcfb2ad Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 14 Dec 2015 15:32:03 +0100 Subject: [PATCH] 8145212: ISO-8859-1 isn't properly handled as 'fastEncoding' in jni_util.c Reviewed-by: martin, rriggs --- jdk/src/java.base/share/native/libjava/jni_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/src/java.base/share/native/libjava/jni_util.c b/jdk/src/java.base/share/native/libjava/jni_util.c index 7308b08b192..89f6edb7c03 100644 --- a/jdk/src/java.base/share/native/libjava/jni_util.c +++ b/jdk/src/java.base/share/native/libjava/jni_util.c @@ -660,7 +660,8 @@ initializeEncoding(JNIEnv *env) */ if ((strcmp(encname, "8859_1") == 0) || (strcmp(encname, "ISO8859-1") == 0) || - (strcmp(encname, "ISO8859_1") == 0)) + (strcmp(encname, "ISO8859_1") == 0) || + (strcmp(encname, "ISO-8859-1") == 0)) fastEncoding = FAST_8859_1; else if (strcmp(encname, "ISO646-US") == 0) fastEncoding = FAST_646_US;