make/src/classes/build/tools/cldrconverter/CLDRConverter.java

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2015, 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) 2012, 2016, 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
*** 582,592 ****
              jreTimeZoneNames.stream().forEach(e -> {
                  String tzid = (String)e[0];
                  String[] data = (String[])e[1];
  
                  if (map.get(TIMEZONE_ID_PREFIX + tzid) == null &&
!                     handlerMetaZones.get(tzid) == null) {
                      // First, check the CLDR meta key
                      Optional<Map.Entry<String, String>> cldrMeta =
                          handlerMetaZones.getData().entrySet().stream()
                              .filter(me ->
                                  Arrays.deepEquals(data,
--- 582,594 ----
              jreTimeZoneNames.stream().forEach(e -> {
                  String tzid = (String)e[0];
                  String[] data = (String[])e[1];
  
                  if (map.get(TIMEZONE_ID_PREFIX + tzid) == null &&
!                     handlerMetaZones.get(tzid) == null ||
!                     handlerMetaZones.get(tzid) != null &&
!                     map.get(METAZONE_ID_PREFIX + handlerMetaZones.get(tzid)) == null) {
                      // First, check the CLDR meta key
                      Optional<Map.Entry<String, String>> cldrMeta =
                          handlerMetaZones.getData().entrySet().stream()
                              .filter(me ->
                                  Arrays.deepEquals(data,