--- a/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java	Fri Jun 11 14:47:22 2010 +0100
+++ b/jdk/src/share/classes/sun/nio/cs/ext/HKSCS.java	Sat Jun 12 01:32:43 2010 +0100
@@ -43,7 +43,7 @@
 
         private char[][] b2cBmp;
         private char[][] b2cSupp;
-        private static DoubleByte.Decoder big5Dec;
+        private DoubleByte.Decoder big5Dec;
 
         protected Decoder(Charset cs,
                           DoubleByte.Decoder big5Dec,
@@ -355,7 +355,7 @@
                             c2b[hi] = new char[0x100];
                             Arrays.fill(c2b[hi], (char)UNMAPPABLE_ENCODING);
                         }
-                        c2b[hi][c & 0xff] = (char)bb;
+                        c2b[hi][c & 0xff] = bb;
                     }
                     c++;
                 }