Skip to content
Permalink
Browse files
8216969: ParseException thrown for certain months with russian locale
Backport-of: 0623444
  • Loading branch information
GoeLin committed Feb 9, 2022
1 parent 288c9f7 commit cd7d8c6c5d51eb9999b88f793b1e69bbdcb27353
Showing 2 changed files with 35 additions and 4 deletions.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, 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
@@ -1189,7 +1189,7 @@ private void subFormat(int patternCharIndex, int count,
}
break;

case PATTERN_MONTH: // 'M' (context seinsive)
case PATTERN_MONTH: // 'M' (context sensitive)
if (useDateFormatSymbols) {
String[] months;
if (count >= 4) {
@@ -2033,7 +2033,7 @@ private int subParse(String text, int start, int patternCharIndex, int count,
return index;
}
} else {
Map<String, Integer> map = getDisplayNamesMap(field, locale);
Map<String, Integer> map = getDisplayContextNamesMap(field, locale);
if ((index = matchString(text, start, field, map, calb)) > 0) {
return index;
}
@@ -2449,6 +2449,22 @@ private Map<String, Integer> getDisplayNamesMap(int field, Locale locale) {
return map;
}

/**
* Obtains display names map, taking the context into account. Currently only
* the month name pattern 'M' is context dependent.
*/
private Map<String, Integer> getDisplayContextNamesMap(int field, Locale locale) {
Map<String, Integer> map = calendar.getDisplayNames(field,
forceStandaloneForm ? Calendar.SHORT_STANDALONE : Calendar.SHORT_FORMAT, locale);
// Get the LONG style
Map<String, Integer> m = calendar.getDisplayNames(field,
forceStandaloneForm ? Calendar.LONG_STANDALONE : Calendar.LONG_FORMAT, locale);
if (m != null) {
map.putAll(m);
}
return map;
}

/**
* After reading an object from the input stream, the format
* pattern in the object is verified.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2019, 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
@@ -24,6 +24,7 @@
/**
* @test
* @bug 4052223 4089987 4469904 4326988 4486735 8008577 8045998 8140571
* 8216969
* @summary test DateFormat and SimpleDateFormat.
* @library /java/text/testlib
* @modules jdk.localedata
@@ -1205,4 +1206,18 @@ public void Test4486735() throws Exception {
TimeZone.setDefault(initialTimeZone);
}
}

public void Test8216969() throws Exception {
Locale locale = new Locale("ru");
String format = "\u0434\u0435\u043a";
String standalone = "\u0434\u0435\u043a.";

// Check that format form is used so that the dot is parsed correctly.
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMM.yyyy", locale);
System.out.println(simpleDateFormat.parse("28 " + format + ".2018"));

// Check that standalone form is used.
simpleDateFormat = new SimpleDateFormat("MMM", locale);
System.out.println(simpleDateFormat.parse(standalone));
}
}

1 comment on commit cd7d8c6

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on cd7d8c6 Feb 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.