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

8225426: Replace plain with system-default in Socket and ServerSocket

Browse source 
Reviewed-by: alanb, dfuchs
This commit is contained in:
Chris Hegarty 2019-06-11 09:21:34 +01:00
parent 98e6903c57
commit b6696bad84
2 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,9 +106,10 @@ class ServerSocket implements java.io.Closeable {
* request to connect) is set to {@code 50}. If a connection * request to connect) is set to {@code 50}. If a connection
* indication arrives when the queue is full, the connection is refused. * indication arrives when the queue is full, the connection is refused.
* <p> * <p>
* If the application has specified a server socket factory, that * If the application has specified a server socket implementation
* factory's {@code createSocketImpl} method is called to create * factory, that factory's {@code createSocketImpl} method is called to
* the actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* <p> * <p>
* If there is a security manager, * If there is a security manager,
* its {@code checkListen} method is called * its {@code checkListen} method is called
@ -150,9 +151,10 @@ class ServerSocket implements java.io.Closeable {
* a connection indication arrives when the queue is full, the * a connection indication arrives when the queue is full, the
* connection is refused. * connection is refused.
* <p> * <p>
* If the application has specified a server socket factory, that * If the application has specified a server socket implementation
* factory's {@code createSocketImpl} method is called to create * factory, that factory's {@code createSocketImpl} method is called to
* the actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* <p> * <p>
* If there is a security manager, * If there is a security manager,
* its {@code checkListen} method is called * its {@code checkListen} method is called

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

@ -89,8 +89,12 @@ class Socket implements java.io.Closeable {
} }
/** /**
* Creates an unconnected socket, with the * Creates an unconnected Socket.
* system-default type of SocketImpl. * <p>
* If the application has specified a client socket implementation
* factory, that factory's {@code createSocketImpl} method is called to
* create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* *
* @since 1.1 * @since 1.1
* @revised 1.4 * @revised 1.4
@ -194,9 +198,10 @@ class Socket implements java.io.Closeable {
* In other words, it is equivalent to specifying an address of the * In other words, it is equivalent to specifying an address of the
* loopback interface. </p> * loopback interface. </p>
* <p> * <p>
* If the application has specified a server socket factory, that * If the application has specified a client socket implementation
* factory's {@code createSocketImpl} method is called to create * factory, that factory's {@code createSocketImpl} method is called to
* the actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* <p> * <p>
* If there is a security manager, its * If there is a security manager, its
* {@code checkConnect} method is called * {@code checkConnect} method is called
@ -232,9 +237,10 @@ class Socket implements java.io.Closeable {
* Creates a stream socket and connects it to the specified port * Creates a stream socket and connects it to the specified port
* number at the specified IP address. * number at the specified IP address.
* <p> * <p>
* If the application has specified a socket factory, that factory's * If the application has specified a client socket implementation
* {@code createSocketImpl} method is called to create the * factory, that factory's {@code createSocketImpl} method is called to
* actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* <p> * <p>
* If there is a security manager, its * If there is a security manager, its
* {@code checkConnect} method is called * {@code checkConnect} method is called
@ -358,9 +364,10 @@ class Socket implements java.io.Closeable {
* stream socket. If the stream argument is {@code false}, it * stream socket. If the stream argument is {@code false}, it
* creates a datagram socket. * creates a datagram socket.
* <p> * <p>
* If the application has specified a server socket factory, that * If the application has specified a client socket implementation
* factory's {@code createSocketImpl} method is called to create * factory, that factory's {@code createSocketImpl} method is called to
* the actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* <p> * <p>
* If there is a security manager, its * If there is a security manager, its
* {@code checkConnect} method is called * {@code checkConnect} method is called
@ -400,9 +407,10 @@ class Socket implements java.io.Closeable {
* stream socket. If the stream argument is {@code false}, it * stream socket. If the stream argument is {@code false}, it
* creates a datagram socket. * creates a datagram socket.
* <p> * <p>
* If the application has specified a server socket factory, that * If the application has specified a client socket implementation
* factory's {@code createSocketImpl} method is called to create * factory, that factory's {@code createSocketImpl} method is called to
* the actual socket implementation. Otherwise a "plain" socket is created. * create the actual socket implementation. Otherwise a system-default
* socket implementation is created.
* *
* <p>If there is a security manager, its * <p>If there is a security manager, its
* {@code checkConnect} method is called * {@code checkConnect} method is called