diff --git a/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java b/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java index 2ef819ae9135c29009e2f058fb6eb8f5a6868c20..b2120458a45ca6227d5c6c73430dfd074effbcdf 100644 --- a/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java +++ b/src/share/classes/sun/util/locale/provider/JRELocaleProviderAdapter.java @@ -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; } diff --git a/test/java/text/Collator/Bug7200119.java b/test/java/text/Collator/Bug7200119.java new file mode 100644 index 0000000000000000000000000000000000000000..74ffc3041230df16dd29e4ef8a2efd06bddfdf1c --- /dev/null +++ b/test/java/text/Collator/Bug7200119.java @@ -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 avail = Arrays.asList(Collator.getAvailableLocales()); + + if (!avail.contains(Locale.US)) { + throw new RuntimeException("Failed."); + } + } +}