stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7200119: Collator.getAvailableLocales() doesn't return Locale.US

Browse Source 
Reviewed-by: okutsu
This commit is contained in:
Naoto Sato 2012-10-04 21:03:36 -07:00
parent 3caba25f6b
commit efea116274
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java
View File

@ -328,6 +328,10 @@ public class JRELocaleProviderAdapter extends LocaleProviderAdapter {
}
tagset.add(token);
}
// ensure en-US is there (mandated by the spec, e.g. Collator.getAvailableLocales())
tagset.add("en-US");
return tagset;
}

40
jdk/test/java/text/Collator/Bug7200119.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2012, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7200119
* @summary verify that getAvailableLocales() contains Locale.US
*/
import java.text.*;
import java.util.*;
public class Bug7200119 {
public static void main(String[] args) {
List<Locale> avail = Arrays.asList(Collator.getAvailableLocales());
if (!avail.contains(Locale.US)) {
throw new RuntimeException("Failed.");
}
}
}