# HG changeset patch
# User simonis
# Date 1450103523 -3600
# Node ID 2d073b8f1a16d16b794515d4f3b70cf5e0217fb9
# Parent  fe3b7950bc4e23e016a70d8a64a37f290ab1c41c
8145212: ISO-8859-1 isn't properly handled as 'fastEncoding' in jni_util.c
Reviewed-by: martin, rriggs

diff -r fe3b7950bc4e -r 2d073b8f1a16 jdk/src/java.base/share/native/libjava/jni_util.c
--- a/jdk/src/java.base/share/native/libjava/jni_util.c	Mon Dec 14 19:49:10 2015 +0000
+++ b/jdk/src/java.base/share/native/libjava/jni_util.c	Mon Dec 14 15:32:03 2015 +0100
@@ -660,7 +660,8 @@
             */
                     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;