infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8317126: Redundant entries in Windows tzmappings file

Browse Source 
Reviewed-by: lancea, iris, joehw
This commit is contained in:
Naoto Sato 2023-09-29 16:36:29 +00:00
parent fa0697a637
commit 014c95a54d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/jdk/src/classes/build/tools/cldrconverter/CLDRConverter.java
View File

@ -1184,6 +1184,8 @@ public class CLDRConverter {
Files.createDirectories(Paths.get(DESTINATION_DIR, "windows", "conf"));
Files.write(Paths.get(DESTINATION_DIR, "windows", "conf", "tzmappings"),
handlerWinZones.keySet().stream()
.filter(k -> k.endsWith(":001") ||
!handlerWinZones.get(k).equals(handlerWinZones.get(k.replaceFirst(":\\w{2,3}$", ":001"))))
.map(k -> k + ":" + handlerWinZones.get(k) + ":")
.sorted(new Comparator<String>() {
public int compare(String t1, String t2) {