jdk-sandbox: comparison src/java.base/share/classes/sun/nio/ch/ServerSocketAdaptor.java

equal deleted inserted replaced

-:b43cc3b9ef40
+:13b67c1420b8
 /*
-* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2019, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketException;
-import java.net.SocketTimeoutException;
+import java.net.SocketOption;
 import java.net.StandardSocketOptions;
 import java.nio.channels.IllegalBlockingModeException;
-import java.nio.channels.NotYetBoundException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
+import java.util.Set;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 // Make a server-socket channel look like a server socket.
 //
 // The methods in this class are defined in exactly the same order as in
 private final ServerSocketChannelImpl ssc;
 // Timeout "option" value for accepts
 private volatile int timeout;
-public static ServerSocket create(ServerSocketChannelImpl ssc) {
+static ServerSocket create(ServerSocketChannelImpl ssc) {
-try {
+return new ServerSocketAdaptor(ssc);
-return new ServerSocketAdaptor(ssc);
+}
-} catch (IOException x) {
-throw new Error(x);
+private ServerSocketAdaptor(ServerSocketChannelImpl ssc) {
-}
+super(DummySocketImpl.create());
-}
-// ## super will create a useless impl
-private ServerSocketAdaptor(ServerSocketChannelImpl ssc) throws IOException {
 this.ssc = ssc;
 }
+@Override
 public void bind(SocketAddress local) throws IOException {
 bind(local, 50);
 }
+@Override
 public void bind(SocketAddress local, int backlog) throws IOException {
 if (local == null)
 local = new InetSocketAddress(0);
 try {
 ssc.bind(local, backlog);
 } catch (Exception x) {
 Net.translateException(x);
 }
 }
+@Override
 public InetAddress getInetAddress() {
 InetSocketAddress local = ssc.localAddress();
 if (local == null) {
 return null;
 } else {
 return Net.getRevealedLocalAddress(local).getAddress();
 }
 }
+@Override
 public int getLocalPort() {
 InetSocketAddress local = ssc.localAddress();
 if (local == null) {
 return -1;
 } else {
 return local.getPort();
 }
 }
+@Override
 public Socket accept() throws IOException {
-synchronized (ssc.blockingLock()) {
+SocketChannel sc = null;
 try {
-if (!ssc.isBound())
+int timeout = this.timeout;
-throw new NotYetBoundException();
+if (timeout > 0) {
+long nanos = MILLISECONDS.toNanos(timeout);
-long to = this.timeout;
+sc = ssc.blockingAccept(nanos);
-if (to == 0) {
+} else {
-// for compatibility reasons: accept connection if available
+// accept connection if possible when non-blocking (to preserve
-// when configured non-blocking
+// long standing behavior)
-SocketChannel sc = ssc.accept();
+sc = ssc.accept();
-if (sc == null && !ssc.isBlocking())
+if (sc == null) {
 throw new IllegalBlockingModeException();
-return sc.socket();
 }
-if (!ssc.isBlocking())
-throw new IllegalBlockingModeException();
-for (;;) {
-long st = System.currentTimeMillis();
-if (ssc.pollAccept(to))
-return ssc.accept().socket();
-to -= System.currentTimeMillis() - st;
-if (to <= 0)
-throw new SocketTimeoutException();
-}
-} catch (Exception x) {
-Net.translateException(x);
-assert false;
-return null;            // Never happens
 }
-}
+} catch (Exception e) {
-}
+Net.translateException(e);
+}
+return sc.socket();
+}
+@Override
 public void close() throws IOException {
 ssc.close();
 }
+@Override
 public ServerSocketChannel getChannel() {
 return ssc;
 }
+@Override
 public boolean isBound() {
 return ssc.isBound();
 }
+@Override
 public boolean isClosed() {
 return !ssc.isOpen();
 }
+@Override
 public void setSoTimeout(int timeout) throws SocketException {
+if (!ssc.isOpen())
+throw new SocketException("Socket is closed");
+if (timeout < 0)
+throw new IllegalArgumentException("timeout < 0");
 this.timeout = timeout;
 }
+@Override
 public int getSoTimeout() throws SocketException {
+if (!ssc.isOpen())
+throw new SocketException("Socket is closed");
 return timeout;
 }
+@Override
 public void setReuseAddress(boolean on) throws SocketException {
 try {
 ssc.setOption(StandardSocketOptions.SO_REUSEADDR, on);
 } catch (IOException x) {
 Net.translateToSocketException(x);
 }
 }
+@Override
 public boolean getReuseAddress() throws SocketException {
 try {
 return ssc.getOption(StandardSocketOptions.SO_REUSEADDR).booleanValue();
 } catch (IOException x) {
 Net.translateToSocketException(x);
 return false;       // Never happens
 }
 }
+@Override
 public String toString() {
 if (!isBound())
 return "ServerSocket[unbound]";
 return "ServerSocket[addr=" + getInetAddress() +
 ",localport=" + getLocalPort()  + "]";
 }
+@Override
 public void setReceiveBufferSize(int size) throws SocketException {
 // size 0 valid for ServerSocketChannel, invalid for ServerSocket
 if (size <= 0)
 throw new IllegalArgumentException("size cannot be 0 or negative");
 try {
 } catch (IOException x) {
 Net.translateToSocketException(x);
 }
 }
+@Override
 public int getReceiveBufferSize() throws SocketException {
 try {
 return ssc.getOption(StandardSocketOptions.SO_RCVBUF).intValue();
 } catch (IOException x) {
 Net.translateToSocketException(x);
 return -1;          // Never happens
 }
 }
+@Override
+public <T> ServerSocket setOption(SocketOption<T> name, T value) throws IOException {
+ssc.setOption(name, value);
+return this;
+}
+@Override
+public <T> T getOption(SocketOption<T> name) throws IOException {
+return ssc.getOption(name);
+}
+@Override
+public Set<SocketOption<?>> supportedOptions() {
+return ssc.supportedOptions();
+}
 }

changeset 54620	13b67c1420b8
parent 49001	ce06058197a4
child 58614	29624901d8bc