src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java

rev 53432 : [mq]: 8217366

*** 1,7 ****
  /*
!  * Copyright (c) 2018, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2018, 2019, 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.  Oracle designates this
*** 146,155 ****
--- 146,161 ----
          }
      }
  
      private void deriveFallbackName(String[] names, int index, Locale locale, boolean noDST) {
          if (exists(names, index)) {
+             if (names[index].equals(NO_INHERITANCE_MARKER)) {
+                 // CLDR's "no inheritance marker"
+                 names[index] = toGMTFormat(names[INDEX_TZID],
+                                     index == INDEX_DST_LONG || index == INDEX_DST_SHORT,
+                                     index % 2 != 0, locale);
+             }
              return;
          }
  
          // Check if COMPAT can substitute the name
          if (LocaleProviderAdapter.getAdapterPreference().contains(Type.JRE)) {