--- old/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java	2014-08-22 11:18:41.182109086 -0700
+++ new/src/java.base/share/classes/sun/util/locale/provider/LocaleNameProviderImpl.java	2014-08-22 11:18:40.909105052 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -39,11 +39,10 @@
  */
 public class LocaleNameProviderImpl extends LocaleNameProvider implements AvailableLanguageTags {
     private final LocaleProviderAdapter.Type type;
-    private final Set<String> langtags;
+    private Set<String> langtags;
 
-    public LocaleNameProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) {
+    public LocaleNameProviderImpl(LocaleProviderAdapter.Type type) {
         this.type = type;
-        this.langtags = langtags;
     }
 
     /**
@@ -55,12 +54,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());
     }
 
     /**
@@ -86,8 +85,8 @@
      * @see java.util.Locale#getDisplayLanguage(java.util.Locale)
      */
     @Override
-    public String getDisplayLanguage(String lang, Locale locale) {
-        return getDisplayString(lang, locale);
+    public String getDisplayLanguage(String languageCode, Locale locale) {
+        return getDisplayString(languageCode, locale);
     }
 
     /**
@@ -143,8 +142,8 @@
      * @see java.util.Locale#getDisplayCountry(java.util.Locale)
      */
     @Override
-    public String getDisplayCountry(String ctry, Locale locale) {
-        return getDisplayString(ctry, locale);
+    public String getDisplayCountry(String countryCode, Locale locale) {
+        return getDisplayString(countryCode, locale);
     }
 
     /**
@@ -164,8 +163,8 @@
      * @see java.util.Locale#getDisplayVariant(java.util.Locale)
      */
     @Override
-    public String getDisplayVariant(String vrnt, Locale locale) {
-        return getDisplayString("%%"+vrnt, locale);
+    public String getDisplayVariant(String variant, Locale locale) {
+        return getDisplayString("%%"+variant, locale);
     }
 
     private String getDisplayString(String key, Locale locale) {
@@ -178,6 +177,13 @@
 
     @Override
     public Set<String> getAvailableLanguageTags() {
+        return getLangTags();
+    }
+
+    private Set<String> getLangTags() {
+        if (langtags == null) {
+            langtags = ((JRELocaleProviderAdapter)LocaleProviderAdapter.forType(type)).getLanguageTagSet("LocaleNames");
+        }
         return langtags;
     }
 }