--- old/test/sun/nio/cs/OLD/DoubleByteEncoder.java	2012-07-19 09:42:59.000000000 -0700
+++ new/test/sun/nio/cs/OLD/DoubleByteEncoder.java	2012-07-19 09:42:58.000000000 -0700
@@ -26,7 +26,6 @@
 /*
  */
 
-//package sun.nio.cs.ext;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -95,7 +94,7 @@
         try {
             while (sp < sl) {
                 char c = sa[sp];
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     if (sgp.parse(c, sa, sp, sl) < 0)
                         return sgp.error();
                     if (sl - sp < 2)
@@ -153,7 +152,7 @@
         try {
             while (src.hasRemaining()) {
                 char c = src.get();
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     int surr;
                     if ((surr = sgp.parse(c, src)) < 0)
                         return sgp.error();