From 293e67d40d2d2508893aac3d68487f5385d3e01d Mon Sep 17 00:00:00 2001
From: sherman <unknown>
Date: Fri, 14 Aug 2009 14:29:45 -0700
Subject: [PATCH] 6730652: CharsetEncoder.canEncode(char) returns incorrect
 values for some charsets Summary: override the canEncode() in ISO2022_CN_CNS
 Reviewed-by: martin

---
 src/share/classes/sun/nio/cs/ext/ISO2022.java        | 6 +++---
 src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java | 9 +++++++++
 test/sun/nio/cs/FindCanEncodeBugs.java               | 6 ++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/share/classes/sun/nio/cs/ext/ISO2022.java b/src/share/classes/sun/nio/cs/ext/ISO2022.java
index 242a841d4..036dc0429 100644
--- a/src/share/classes/sun/nio/cs/ext/ISO2022.java
+++ b/src/share/classes/sun/nio/cs/ext/ISO2022.java
@@ -388,9 +388,9 @@ abstract class ISO2022
 
     protected static class Encoder extends CharsetEncoder {
         private final Surrogate.Parser sgp = new Surrogate.Parser();
-        private final byte SS2 = (byte)0x8e;
-        private final byte PLANE2 = (byte)0xA2;
-        private final byte PLANE3 = (byte)0xA3;
+        public static final byte SS2 = (byte)0x8e;
+        public static final byte PLANE2 = (byte)0xA2;
+        public static final byte PLANE3 = (byte)0xA3;
         private final byte MSB = (byte)0x80;
 
         protected final byte maximumDesignatorLength = 4;
diff --git a/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java b/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
index e5b5d7195..72e11ff1a 100644
--- a/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
+++ b/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
@@ -76,6 +76,15 @@ public class ISO2022_CN_CNS extends ISO2022 implements HistoricallyNamedCharset
             } catch (Exception e) { }
         }
 
+        private byte[] bb = new byte[4];
+        public boolean canEncode(char c) {
+            int n = 0;
+            return (c <= '\u007f' ||
+                    (n = ((EUC_TW.Encoder)ISOEncoder).toEUC(c, bb)) == 2 ||
+                    (n == 4 && bb[0] == SS2 &&
+                     (bb[1] == PLANE2 || bb[1] == PLANE3)));
+        }
+
         /*
          * Since ISO2022-CN-CNS possesses a CharsetEncoder
          * without the corresponding CharsetDecoder half the
diff --git a/test/sun/nio/cs/FindCanEncodeBugs.java b/test/sun/nio/cs/FindCanEncodeBugs.java
index 7331934d5..2fc621899 100644
--- a/test/sun/nio/cs/FindCanEncodeBugs.java
+++ b/test/sun/nio/cs/FindCanEncodeBugs.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777
+   @bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777 6730652
    @summary canEncode() false iff encode() throws CharacterCodingException
    @run main/timeout=1200 FindCanEncodeBugs
    @author Martin Buchholz
@@ -52,9 +52,7 @@ public class FindCanEncodeBugs {
             String csn = e.getKey();
             Charset cs = e.getValue();
 
-            if (! cs.canEncode() ||
-                csn.matches("x-COMPOUND_TEXT")   ||
-                csn.matches("x-ISO-2022-CN-CNS"))  // ISO2022_CN_CNS supports less
+            if (! cs.canEncode() || csn.matches("x-COMPOUND_TEXT"))
                 continue;
 
             //System.out.println(csn);
-- 
GitLab