Skip to content

8387261: Locale.LanguageRange should reject Double.NaN #31697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justin-curtis-lu wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −3
Open

8387261: Locale.LanguageRange should reject Double.NaN #31697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7136743
init
justin-curtis-lu Jun 26, 2026
62c11e6
Review - Add spec update to throws clause
justin-curtis-lu Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/java.base/share/classes/java/util/Locale.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3209,12 +3209,12 @@ public LanguageRange(String range) {
* {@code null}
* @throws IllegalArgumentException if the given {@code range} does not
* comply with the syntax of the language range mentioned in RFC 4647
* or if the given {@code weight} is less than {@code MIN_WEIGHT}
* or if the given {@code weight} is {@code Double.NaN}, less than {@code MIN_WEIGHT}
* or greater than {@code MAX_WEIGHT}
*/
public LanguageRange(String range, double weight) {
Objects.requireNonNull(range);
if (weight < MIN_WEIGHT || weight > MAX_WEIGHT) {
if (weight < MIN_WEIGHT || weight > MAX_WEIGHT || Double.isNaN(weight)) {

@naotoj naotoj Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since the constructor now throws IllegalArgumentException for NaN weights, this should also be specified in the @throws tag, as NaN does not satisfy either NaN < MIN_WEIGHT or NaN > MAX_WEIGHT.

@justin-curtis-lu justin-curtis-lu Jun 26, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

How about updating the @throws wording to be

... or if the given {@code weight} is not between {@code MIN_WEIGHT} and {@code MAX_WEIGHT}, inclusive.

which would cover the NaN case without having to explicitly call it out.

@naotoj naotoj Jun 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

That wording is technically fine, but I would still prefer to call out NaN explicitly. NaN is unordered, so it is a different case from an ordinary out-of-range value, and it is the specific edge case being fixed here.

How about:

... or if the given {@code weight} is {@code NaN}, less than {@code MIN_WEIGHT}, or greater than {@code MAX_WEIGHT}.

throw new IllegalArgumentException("weight=" + weight);
}

Expand Down
4 changes: 3 additions & 1 deletion test/jdk/java/util/Locale/LocaleMatchingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*
* @test
* @bug 7069824 8042360 8032842 8175539 8210443 8242010 8276302 8381644
* @bug 7069824 8042360 8032842 8175539 8210443 8242010 8276302 8381644 8387261
* @summary Verify implementation for Locale matching.
* @run junit/othervm LocaleMatchingTest
*/
Expand Down Expand Up @@ -93,6 +93,7 @@ static Object[][] LRConstructorIAEData() {
{"1996-de-Latn", MAX_WEIGHT},
// Testcase for 8042360
{"en-Latn-1234567890", MAX_WEIGHT},
{"en", Double.NaN},
};
}

Expand Down Expand Up @@ -146,6 +147,7 @@ static Object[][] LRParseIAEData() {
// Ranges
{""},
{"ja;q=3"},
{"en;q=NaN"}
};
}

Expand Down