diff -r f98ac682b34c -r 04eb44085c00 jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java	Wed Jun 30 16:11:31 2010 -0700
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java	Wed Jun 30 16:11:32 2010 -0700
@@ -441,7 +441,7 @@
         }
 
         static int encode(char hi, char low, byte[] bb) {
-            int c = Surrogate.toUCS4(hi, low);
+            int c = Character.toCodePoint(hi, low);
             if ((c & 0xf0000) != 0x20000)
                 return -1;
             c -= 0x20000;