archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8262108: SimpleDateFormat formatting broken for sq_MK Locale

Browse source 
Reviewed-by: naoto
This commit is contained in:
Jaikiran Pai 2021-04-16 06:45:39 +00:00
parent 3423f3e1f5
commit 64e21307a8
3 changed files with 81 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2021, 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
@ -189,7 +189,15 @@ public class CalendarNameProviderImpl extends CalendarNameProvider implements Av
if (name.isEmpty()) {
continue;
}
map.put(name, base + i);
if (field == AM_PM && !javatime && i > PM) {
// Unlike in the case of java.time.format.DateTimeFormatter(Builder),
// when dealing with java.util.Calendar, don't set AM_PM field value
// to anything that isn't either AM or PM (this can happen when
// day periods are involved)
continue;
} else {
map.put(name, base + i);
}
}
}
}