archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8218960: CONFIG level logging statements printed in CLDRCalendarDataProviderImpl.java even when default log Level is INFO

Browse source 
Reviewed-by: nishjain, rriggs
This commit is contained in:
Naoto Sato 2019-02-21 10:26:56 -08:00
parent e58a4da301
commit 86e513bd48
4 changed files with 73 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.base/share/classes/sun/util/cldr/CLDRCalendarDataProviderImpl.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2019, 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
@ -80,7 +80,8 @@ public class CLDRCalendarDataProviderImpl extends CalendarDataProviderImpl {
String region = locale.getCountry();
if (region.isEmpty()) {
return 0;
// Use "US" as default
region = "US";
}
Integer val = map.get(region);

6
src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, 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
@ -256,7 +256,9 @@ public class CalendarDataUtility {
default:
throw new InternalError("invalid requestID: " + requestID);
}
return (value != 0) ? value : null;
assert value != 0;
return value;
}
}
}

6
src/java.base/share/classes/sun/util/locale/provider/LocaleServiceProviderPool.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2019, 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
@ -283,8 +283,8 @@ public final class LocaleServiceProviderPool {
return providersObj;
} else if (isObjectProvider) {
config(LocaleServiceProviderPool.class,
"A locale sensitive service provider returned null for a localized objects, which should not happen. provider: "
+ lsp + " locale: " + locale);
"A locale sensitive service object provider returned null, " +
"which should not happen. Provider: " + lsp + " Locale: " + locale);
}
}
}