jdk-sandbox: comparison src/java.base/share/classes/java/net/Socket.java

equal deleted inserted replaced

-:8b621b0d921c
+:16c087c9103e
 * The implementation of this Socket.
 */
 SocketImpl impl;
 /**
-* Are we using an older SocketImpl?
-*/
-private boolean oldImpl = false;
-/**
 * Socket input/output streams
 */
 private volatile InputStream in;
 private volatile OutputStream out;
 private static final VarHandle IN, OUT;
 }
 // create a SOCKS or HTTP SocketImpl that delegates to a platform SocketImpl
 SocketImpl delegate = SocketImpl.createPlatformSocketImpl(false);
 impl = (type == Proxy.Type.SOCKS) ? new SocksSocketImpl(p, delegate)
-: new HttpConnectSocketImpl(p, delegate);
+: new HttpConnectSocketImpl(p, delegate, this);
-impl.setSocket(this);
 } else {
 if (p == Proxy.NO_PROXY) {
 // create a platform or custom SocketImpl for the DIRECT case
 SocketImplFactory factory = Socket.factory;
 if (factory == null) {
 impl = SocketImpl.createPlatformSocketImpl(false);
 } else {
 impl = factory.createSocketImpl();
 }
-impl.setSocket(this);
 } else
 throw new IllegalArgumentException("Invalid Proxy");
 }
 }
 * such as a TCP error.
 * @since   1.1
 */
 protected Socket(SocketImpl impl) throws SocketException {
 this.impl = impl;
-if (impl != null) {
-checkOldImpl();
-this.impl.setSocket(this);
-}
 }
 /**
 * Creates a stream socket and connects it to the specified port
 * number on the named host.
 } catch (IOException e) {
 throw new SocketException(e.getMessage());
 }
 }
-private void checkOldImpl() {
-if (impl == null)
-return;
-// SocketImpl.connect() is a protected method, therefore we need to use
-// getDeclaredMethod, therefore we need permission to access the member
-oldImpl = AccessController.doPrivileged
-(new PrivilegedAction<>() {
-public Boolean run() {
-Class<?> clazz = impl.getClass();
-while (true) {
-try {
-clazz.getDeclaredMethod("connect", SocketAddress.class, int.class);
-return Boolean.FALSE;
-} catch (NoSuchMethodException e) {
-clazz = clazz.getSuperclass();
-// java.net.SocketImpl class will always have this abstract method.
-// If we have not found it by now in the hierarchy then it does not
-// exist, we are an old style impl.
-if (clazz.equals(java.net.SocketImpl.class)) {
-return Boolean.TRUE;
-}
-}
-}
-}
-});
-}
 void setImpl(SocketImpl si) {
 impl = si;
-impl.setSocket(this);
 }
 /**
 * Sets impl to the system-default type of SocketImpl.
 * @since 1.4
 */
 void setImpl() {
 SocketImplFactory factory = Socket.factory;
 if (factory != null) {
 impl = factory.createSocketImpl();
-checkOldImpl();
 } else {
 // create a SOCKS SocketImpl that delegates to a platform SocketImpl
 SocketImpl delegate = SocketImpl.createPlatformSocketImpl(false);
 impl = new SocksSocketImpl(delegate);
 }
-if (impl != null)
-impl.setSocket(this);
 }
 /**
 * Get the {@code SocketImpl} attached to this socket, creating
 * it if necessary.
 throw new IllegalArgumentException("connect: timeout can't be negative");
 if (isClosed())
 throw new SocketException("Socket is closed");
-if (!oldImpl && isConnected())
+if (isConnected())
 throw new SocketException("already connected");
 if (!(endpoint instanceof InetSocketAddress))
 throw new IllegalArgumentException("Unsupported address type");
 else
 security.checkConnect(addr.getHostAddress(), port);
 }
 if (!created)
 createImpl(true);
-if (!oldImpl)
+impl.connect(epoint, timeout);
-impl.connect(epoint, timeout);
-else if (timeout == 0) {
-if (epoint.isUnresolved())
-impl.connect(addr.getHostName(), port);
-else
-impl.connect(addr, port);
-} else
-throw new UnsupportedOperationException("SocketImpl.connect(addr, timeout)");
 connected = true;
 /*
 * If the socket was not bound before the connect, it is now because
 * the kernel will have picked an ephemeral port & a local address
 */
 * @see #isBound
 */
 public void bind(SocketAddress bindpoint) throws IOException {
 if (isClosed())
 throw new SocketException("Socket is closed");
-if (!oldImpl && isBound())
+if (isBound())
 throw new SocketException("Already bound");
 if (bindpoint != null && (!(bindpoint instanceof InetSocketAddress)))
 throw new IllegalArgumentException("Unsupported address type");
 InetSocketAddress epoint = (InetSocketAddress) bindpoint;
 */
 final void postAccept() {
 connected = true;
 created = true;
 bound = true;
-}
-void setCreated() {
-created = true;
-}
-void setBound() {
-bound = true;
-}
-void setConnected() {
-connected = true;
 }
 /**
 * Returns the address to which the socket is connected.
 * <p>
 * I/O events.
 */
 private static class SocketInputStream extends InputStream {
 private final Socket parent;
 private final InputStream in;
 SocketInputStream(Socket parent, InputStream in) {
 this.parent = parent;
 this.in = in;
 }
 @Override
 }
 @Override
 public int available() throws IOException {
 return in.available();
 }
 @Override
 public void close() throws IOException {
 parent.close();
 }
 }
 }
 @Override
 public void write(byte b[], int off, int len) throws IOException {
 out.write(b, off, len);
 }
 @Override
 public void close() throws IOException {
 parent.close();
 }
 }
 *
 * @return true if the socket was successfully connected to a server
 * @since 1.4
 */
 public boolean isConnected() {
-// Before 1.3 Sockets were always connected during creation
+return connected;
-return connected || oldImpl;
 }
 /**
 * Returns the binding state of the socket.
 * <p>
 * @return true if the socket was successfully bound to an address
 * @since 1.4
 * @see #bind
 */
 public boolean isBound() {
-// Before 1.3 Sockets were always bound during creation
+return bound;
-return bound || oldImpl;
 }
 /**
 * Returns the closed state of the socket.
 *

branch	niosocketimpl-branch
changeset 57347	16c087c9103e
parent 57344	8b621b0d921c
parent 54689	b28b7f631301
child 57382	14e01d39c01a