--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java	Fri Aug 28 16:53:44 2009 -0700
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java	Mon Aug 31 15:00:04 2009 -0700
@@ -318,7 +318,7 @@
                     outputByte = tmpBuf;
                     char c = sa[sp];
 
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, sa, sp, sl) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
@@ -372,7 +372,7 @@
                 while (src.hasRemaining()) {
                     outputByte = tmpBuf;
                     char c = src.get();
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, src) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();