archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8283620: System.out does not use the encoding/charset specified in the Javadoc

Browse source 
Reviewed-by: alanb
This commit is contained in:
Naoto Sato 2022-04-26 16:05:20 +00:00
parent 20a132d460
commit 03bcf7b6d1
8 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/windows/native/libjava/java_props_md.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -709,15 +709,15 @@ GetJavaProperties(JNIEnv* env)
hStdOutErr = GetStdHandle(STD_OUTPUT_HANDLE);
if (hStdOutErr != INVALID_HANDLE_VALUE &&
GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
sprops.sun_stdout_encoding = getConsoleEncoding();
sprops.stdout_encoding = getConsoleEncoding();
}
hStdOutErr = GetStdHandle(STD_ERROR_HANDLE);
if (hStdOutErr != INVALID_HANDLE_VALUE &&
GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
if (sprops.sun_stdout_encoding != NULL)
sprops.sun_stderr_encoding = sprops.sun_stdout_encoding;
if (sprops.stdout_encoding != NULL)
sprops.stderr_encoding = sprops.stdout_encoding;
else
sprops.sun_stderr_encoding = getConsoleEncoding();
sprops.stderr_encoding = getConsoleEncoding();
}
}
}