mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
8263561: Re-examine uses of LinkedList
Reviewed-by: redestad
This commit is contained in:
parent
6a3f8343bc
commit
249d641889
9 changed files with 45 additions and 47 deletions
|
@ -26,7 +26,7 @@
|
|||
package sun.net.dns;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.LinkedList;
|
||||
import java.util.ArrayList;
|
||||
import java.util.StringTokenizer;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.FileReader;
|
||||
|
@ -56,11 +56,11 @@ public class ResolverConfigurationImpl
|
|||
// Parse /etc/resolv.conf to get the values for a particular
|
||||
// keyword.
|
||||
//
|
||||
private LinkedList<String> resolvconf(String keyword,
|
||||
private ArrayList<String> resolvconf(String keyword,
|
||||
int maxperkeyword,
|
||||
int maxkeywords)
|
||||
{
|
||||
LinkedList<String> ll = new LinkedList<>();
|
||||
ArrayList<String> ll = new ArrayList<>();
|
||||
|
||||
try {
|
||||
BufferedReader in =
|
||||
|
@ -111,8 +111,8 @@ public class ResolverConfigurationImpl
|
|||
return ll;
|
||||
}
|
||||
|
||||
private LinkedList<String> searchlist;
|
||||
private LinkedList<String> nameservers;
|
||||
private ArrayList<String> searchlist;
|
||||
private ArrayList<String> nameservers;
|
||||
|
||||
|
||||
// Load DNS configuration from OS
|
||||
|
@ -133,7 +133,7 @@ public class ResolverConfigurationImpl
|
|||
nameservers =
|
||||
java.security.AccessController.doPrivileged(
|
||||
new java.security.PrivilegedAction<>() {
|
||||
public LinkedList<String> run() {
|
||||
public ArrayList<String> run() {
|
||||
// typically MAXNS is 3 but we've picked 5 here
|
||||
// to allow for additional servers if required.
|
||||
return resolvconf("nameserver", 1, 5);
|
||||
|
@ -151,16 +151,16 @@ public class ResolverConfigurationImpl
|
|||
// obtain search list or local domain
|
||||
|
||||
@SuppressWarnings("removal")
|
||||
private LinkedList<String> getSearchList() {
|
||||
private ArrayList<String> getSearchList() {
|
||||
|
||||
LinkedList<String> sl;
|
||||
ArrayList<String> sl;
|
||||
|
||||
// first try the search keyword in /etc/resolv.conf
|
||||
|
||||
sl = java.security.AccessController.doPrivileged(
|
||||
new java.security.PrivilegedAction<>() {
|
||||
public LinkedList<String> run() {
|
||||
LinkedList<String> ll;
|
||||
public ArrayList<String> run() {
|
||||
ArrayList<String> ll;
|
||||
|
||||
// first try search keyword (max 6 domains)
|
||||
ll = resolvconf("search", 6, 1);
|
||||
|
@ -183,8 +183,8 @@ public class ResolverConfigurationImpl
|
|||
|
||||
sl = java.security.AccessController.doPrivileged(
|
||||
new java.security.PrivilegedAction<>() {
|
||||
public LinkedList<String> run() {
|
||||
LinkedList<String> ll;
|
||||
public ArrayList<String> run() {
|
||||
ArrayList<String> ll;
|
||||
|
||||
ll = resolvconf("domain", 1, 1);
|
||||
if (ll.size() > 0) {
|
||||
|
@ -201,7 +201,7 @@ public class ResolverConfigurationImpl
|
|||
// no local domain so try fallback (RPC) domain or
|
||||
// hostName
|
||||
|
||||
sl = new LinkedList<>();
|
||||
sl = new ArrayList<>();
|
||||
String domain = fallbackDomain0();
|
||||
if (domain != null && !domain.isEmpty()) {
|
||||
sl.add(domain);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue