diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/java/net/ServerSocket.java | 8 | ||||
| -rw-r--r-- | libjava/java/net/Socket.java | 9 |
3 files changed, 24 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 434cc20..784cd5f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-06-28 Michael Koch <konqueror@gmx.de> + + * java/net/ServerSocket.java + (setChannel): New method. + * java/net/Socket.java + (setChannel): New method. + 2003-06-27 Michael Koch <konqueror@gmx.de> * java/beans/beancontext/BeanContextSupport.java: diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java index 8dd420b..699319e 100644 --- a/libjava/java/net/ServerSocket.java +++ b/libjava/java/net/ServerSocket.java @@ -164,6 +164,14 @@ public class ServerSocket bind (new InetSocketAddress (bindAddr, port), backlog); } + /* + * This method may only be used by java.nio.channels.ServerSocketChannel.open. + */ + void setChannel (ServerSocketChannel ch) + { + this.ch = ch; + } + /** * Binds the server socket to a specified socket address * diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 38b31ec..ef88de5 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -305,6 +305,15 @@ public class Socket // that default. JDK 1.2 doc infers not to do a bind. } + /* + * This method may only be used by java.nio.channels.ServerSocketChannel.accept and + * java.nio.channels.SocketChannel.open. + */ + void setChannel (SocketChannel ch) + { + this.ch = ch; + } + /** * Binds the socket to the givent local address/port * |