--- old/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java	2014-08-22 11:18:26.841897166 -0700
+++ new/src/java.base/share/classes/sun/util/locale/provider/CalendarDataProviderImpl.java	2014-08-22 11:18:26.522892452 -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
@@ -37,11 +37,10 @@
  */
 public class CalendarDataProviderImpl extends CalendarDataProvider implements AvailableLanguageTags {
     private final LocaleProviderAdapter.Type type;
-    private final Set<String> langtags;
+    private Set<String> langtags;
 
-    public CalendarDataProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) {
+    public CalendarDataProviderImpl(LocaleProviderAdapter.Type type) {
         this.type = type;
-        this.langtags = langtags;
     }
 
     @Override
@@ -58,11 +57,18 @@
 
     @Override
     public Locale[] getAvailableLocales() {
-        return LocaleProviderAdapter.toLocaleArray(langtags);
+        return LocaleProviderAdapter.toLocaleArray(getLangTags());
     }
 
     @Override
     public Set<String> getAvailableLanguageTags() {
+        return getLangTags();
+    }
+
+    private Set<String> getLangTags() {
+        if (langtags == null) {
+            langtags = ((JRELocaleProviderAdapter)LocaleProviderAdapter.forType(type)).getLanguageTagSet("CalendarData");
+        }
         return langtags;
     }
 }