archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8213418: Socket/ServerSocket supportedOptions does not work with custom SocketImpl

Browse source 
Reviewed-by: alanb, dfuchs
This commit is contained in:
Chris Hegarty 2018-11-08 16:16:57 +00:00
parent 7d4e8d0e26
commit 4187dff26a
3 changed files with 214 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/java.base/share/classes/java/net/ServerSocket.java
View file

@ -993,8 +993,8 @@ class ServerSocket implements java.io.Closeable {
return getImpl().getOption(name);
}
private static Set<SocketOption<?>> options;
private static boolean optionsSet = false;
// cache of unmodifiable impl options. Possibly set racy, in impl we trust
private volatile Set<SocketOption<?>> options;
/**
* Returns a set of the socket options supported by this server socket.
@ -1008,19 +1008,17 @@ class ServerSocket implements java.io.Closeable {
* @since 9
*/
public Set<SocketOption<?>> supportedOptions() {
synchronized (ServerSocket.class) {
if (optionsSet) {
return options;
}
try {
SocketImpl impl = getImpl();
options = Collections.unmodifiableSet(impl.supportedOptions());
} catch (IOException e) {
options = Collections.emptySet();
}
optionsSet = true;
return options;
Set<SocketOption<?>> so = options;
if (so != null)
return so;
try {
SocketImpl impl = getImpl();
options = Collections.unmodifiableSet(impl.supportedOptions());
} catch (IOException e) {
options = Collections.emptySet();
}
return options;
}
static {

28
src/java.base/share/classes/java/net/Socket.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2018, 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
@ -1789,8 +1789,8 @@ class Socket implements java.io.Closeable {
return getImpl().getOption(name);
}
private static Set<SocketOption<?>> options;
private static boolean optionsSet = false;
// cache of unmodifiable impl options. Possibly set racy, in impl we trust
private volatile Set<SocketOption<?>> options;
/**
* Returns a set of the socket options supported by this socket.
@ -1804,18 +1804,16 @@ class Socket implements java.io.Closeable {
* @since 9
*/
public Set<SocketOption<?>> supportedOptions() {
synchronized (Socket.class) {
if (optionsSet) {
return options;
}
try {
SocketImpl impl = getImpl();
options = Collections.unmodifiableSet(impl.supportedOptions());
} catch (IOException e) {
options = Collections.emptySet();
}
optionsSet = true;
return options;
Set<SocketOption<?>> so = options;
if (so != null)
return so;
try {
SocketImpl impl = getImpl();
options = Collections.unmodifiableSet(impl.supportedOptions());
} catch (IOException e) {
options = Collections.emptySet();
}
return options;
}
}