initial commit

naotoj · Oct 14, 2024 · 0536cc4 · 0536cc4
1 parent 580eb62
commit 0536cc4
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/src/java.base/share/classes/java/io/Console.java b/src/java.base/share/classes/java/io/Console.java
@@ -614,27 +614,12 @@ private static UnsupportedOperationException newUnsupportedOperationException()
                 "Console class itself does not provide implementation");
     }
 
-    private static native String encoding();
     private static final boolean istty = istty();
     static final Charset CHARSET;
     static {
-        Charset cs = null;
-
-        if (istty) {
-            String csname = encoding();
-            if (csname == null) {
-                csname = GetPropertyAction.privilegedGetProperty("stdout.encoding");
-            }
-            if (csname != null) {
-                cs = Charset.forName(csname, null);
-            }
-        }
-        if (cs == null) {
-            cs = Charset.forName(StaticProperty.nativeEncoding(),
-                    Charset.defaultCharset());
-        }
-
-        CHARSET = cs;
+        CHARSET = Charset.forName(GetPropertyAction.privilegedGetProperty("stdout.encoding"),
+                                  Charset.forName(StaticProperty.nativeEncoding(),
+                                                  Charset.defaultCharset()));
 
         cons = instantiateConsole();