--- a/src/java.base/share/classes/java/nio/charset/Charset.java Wed Mar 28 21:14:03 2018 -0700
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java Wed Mar 28 21:14:06 2018 -0700
@@ -26,7 +26,6 @@
package java.nio.charset;
import jdk.internal.misc.VM;
-import sun.nio.cs.StandardCharsets;
import sun.nio.cs.ThreadLocalCoders;
import sun.security.action.GetPropertyAction;
@@ -311,7 +310,8 @@
}
/* The standard set of charsets */
- private static final CharsetProvider standardProvider = new StandardCharsets();
+ private static final CharsetProvider standardProvider
+ = new sun.nio.cs.StandardCharsets();
private static final String[] zeroAliases = new String[0];
@@ -609,7 +609,7 @@
if (cs != null)
defaultCharset = cs;
else
- defaultCharset = sun.nio.cs.UTF_8.INSTANCE;
+ defaultCharset = StandardCharsets.UTF_8;
}
}
return defaultCharset;