Skip to content

8302603: Use Set.of in java.nio.charset.Charset #12570

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

Closed
wants to merge 3 commits into from
Closed

8302603: Use Set.of in java.nio.charset.Charset #12570

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f28a3f1
Use Set.of in Charset
Glavo Feb 15, 2023
0eea8b8
update
Glavo Feb 20, 2023
fdb423d
update
Glavo Feb 20, 2023
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
17 changes: 7 additions & 10 deletions src/java.base/share/classes/java/nio/charset/Charset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
Expand Down Expand Up @@ -667,7 +666,7 @@ public static Charset defaultCharset() {

private final String name; // tickles a bug in oldjavac
private final String[] aliases; // tickles a bug in oldjavac
private Set<String> aliasSet = null;
private Set<String> aliasSet;

/**
* Initializes a new charset with the given canonical name and alias
Expand Down Expand Up @@ -714,14 +713,12 @@ public final String name() {
* @return An immutable set of this charset's aliases
*/
public final Set<String> aliases() {
if (aliasSet != null)
return aliasSet;
int n = aliases.length;
HashSet<String> hs = HashSet.newHashSet(n);
for (int i = 0; i < n; i++)
hs.add(aliases[i]);
aliasSet = Collections.unmodifiableSet(hs);
return aliasSet;
Set<String> set = this.aliasSet;
if (set == null) {
set = Set.of(aliases);
this.aliasSet = set;
}
return set;
}

/**
Expand Down