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

8072130: java/lang/instrument/BootClassPath/BootClassPathTest.sh fails on Mac OSX

Browse source 
Reviewed-by: sherman
This commit is contained in:
Brent Christian 2018-09-24 10:41:41 -07:00
parent 73e93bdd5d
commit 3910193204
5 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -348,8 +348,14 @@ static int ParseLocale(JNIEnv* env, int cat, char ** std_language, char ** std_s
* file to correctly read UTF-8 files using the default encoding (see
* 8011194).
*/
if (strcmp(p,"US-ASCII") == 0 && getenv("LANG") == NULL &&
getenv("LC_ALL") == NULL && getenv("LC_CTYPE") == NULL) {
const char* env_lang = getenv("LANG");
const char* env_lc_all = getenv("LC_ALL");
const char* env_lc_ctype = getenv("LC_CTYPE");
if (strcmp(p,"US-ASCII") == 0 &&
(env_lang == NULL || strlen(env_lang) == 0) &&
(env_lc_all == NULL || strlen(env_lc_all) == 0) &&
(env_lc_ctype == NULL || strlen(env_lc_ctype) == 0)) {
*std_encoding = "UTF-8";
}
#endif