infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-18 06:15:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

8176853: Locale.Builder.removeUnicodeLocaleAttribute(null) should throw NullPointerException

Browse Source 
Reviewed-by: martin
This commit is contained in:
Naoto Sato 2017-06-01 12:43:46 -07:00
parent 74cfd999b9
commit b62344e08a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/src/java.base/share/classes/java/util/Locale.java
View File

@ -2702,6 +2702,7 @@ public final class Locale implements Cloneable, Serializable {
* @see #setExtension(char, String)
*/
public Builder removeUnicodeLocaleAttribute(String attribute) {
Objects.requireNonNull(attribute);
try {
localeBuilder.removeUnicodeLocaleAttribute(attribute);
} catch (LocaleSyntaxException e) {

5
jdk/test/java/util/Locale/LocaleEnhanceTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2017, 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
@ -44,7 +44,7 @@ import java.util.Set;
/**
* @test
* @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603
* 7044019 8008577
* 7044019 8008577 8176853
* @summary test API changes to Locale
* @library /java/text/testlib
* @modules jdk.localedata
@ -1032,6 +1032,7 @@ public class LocaleEnhanceTest extends IntlTest {
// null attribute throws NPE
new BuilderNPE("null attribute") { public void call() { b.addUnicodeLocaleAttribute(null); }};
new BuilderNPE("null attribute removal") { public void call() { b.removeUnicodeLocaleAttribute(null); }};
// illformed attribute throws IllformedLocaleException
new BuilderILE("invalid attribute") { public void call() { b.addUnicodeLocaleAttribute("ca"); }};