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

8068278: ArrayIndexOutOfBoundsException instead of DateTimeException in j.t.chrono.JapaneseChronology.eraOf()

Browse source 
Corrected era range check

Reviewed-by: mchung, lancea
This commit is contained in:
Roger Riggs 2015-02-03 14:39:57 -05:00
parent bb5e8afcf2
commit ddb472a4dc
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jdk/src/java.base/share/classes/java/time/chrono/JapaneseEra.java
View file

@ -195,10 +195,11 @@ public final class JapaneseEra
* @throws DateTimeException if the value is invalid
*/
public static JapaneseEra of(int japaneseEra) {
if (japaneseEra < MEIJI.eraValue || japaneseEra + ERA_OFFSET > KNOWN_ERAS.length) {
int i = ordinal(japaneseEra);
if (i < 0 || i >= KNOWN_ERAS.length) {
throw new DateTimeException("Invalid era: " + japaneseEra);
}
return KNOWN_ERAS[ordinal(japaneseEra)];
return KNOWN_ERAS[i];
}
/**