27 lines
1.1 KiB
Diff
Executable File
27 lines
1.1 KiB
Diff
Executable File
From b2b541571c538d3ddd97066b96279882a2a23994 Mon Sep 17 00:00:00 2001
|
|
From: zhangyipeng <zhangyipeng7@huawei.com>
|
|
Date: Tue, 7 Dec 2021 10:17:09 +0800
|
|
Subject: [PATCH] 8239017: cmp-baseline fails because of differences in
|
|
TimeZoneNames_kea
|
|
|
|
---
|
|
.../src/classes/build/tools/cldrconverter/CLDRConverter.java | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
|
|
index 034b8ade4..434912726 100644
|
|
--- a/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
|
|
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
|
|
@@ -665,7 +665,7 @@ public class CLDRConverter {
|
|
}
|
|
|
|
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
|
|
--
|
|
2.22.0
|
|
|