8239017: cmp-baseline fails because of differences in TimeZoneNames_kea

naotoj · naotoj · commit 27391005a5fc · 2020-02-13T17:14:45.000-08:00
Reviewed-by: erikj
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
@@ -685,7 +685,7 @@ private static Map<String, Object> extractCurrencyNames(Map<String, Object> map,
     }
 
     private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {
-        Map<String, Object> names = new HashMap<>();
+        Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);
 
         getAvailableZoneIds().stream().forEach(tzid -> {
             // If the tzid is deprecated, get the data for the replacement id

Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ private static Map<String, Object> extractCurrencyNames(Map<String, Object> map,`
`685`	`685`	`}`
`686`	`686`
`687`	`687`	`private static Map<String, Object> extractZoneNames(Map<String, Object> map, String id) {`
`688`		`- Map<String, Object> names = new HashMap<>();`
	`688`	`+ Map<String, Object> names = new TreeMap<>(KeyComparator.INSTANCE);`
`689`	`689`
`690`	`690`	`getAvailableZoneIds().stream().forEach(tzid -> {`
`691`	`691`	`// If the tzid is deprecated, get the data for the replacement id`