--- old/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java 2014-08-22 11:18:31.708969091 -0700 +++ new/src/java.base/share/classes/sun/util/locale/provider/CollatorProviderImpl.java 2014-08-22 11:18:31.406964629 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, 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 @@ -54,11 +54,10 @@ */ public class CollatorProviderImpl extends CollatorProvider implements AvailableLanguageTags { private final LocaleProviderAdapter.Type type; - private final Set langtags; + private Set langtags; - public CollatorProviderImpl(LocaleProviderAdapter.Type type, Set langtags) { + public CollatorProviderImpl(LocaleProviderAdapter.Type type) { this.type = type; - this.langtags = langtags; } /** @@ -70,12 +69,12 @@ */ @Override public Locale[] getAvailableLocales() { - return LocaleProviderAdapter.toLocaleArray(langtags); + return LocaleProviderAdapter.toLocaleArray(getLangTags()); } @Override public boolean isSupportedLocale(Locale locale) { - return LocaleProviderAdapter.isSupportedLocale(locale, type, langtags); + return LocaleProviderAdapter.isSupportedLocale(locale, type, getLangTags()); } /** @@ -126,6 +125,13 @@ @Override public Set getAvailableLanguageTags() { + return getLangTags(); + } + + private Set getLangTags() { + if (langtags == null) { + langtags = ((JRELocaleProviderAdapter)LocaleProviderAdapter.forType(type)).getLanguageTagSet("CollationData"); + } return langtags; } }