2003-06-28 Michael Koch <konqueror@gmx.de>

	* java/net/ServerSocket.java
	(setChannel): New method.
	* java/net/Socket.java
	(setChannel): New method.

From-SVN: r68631

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 434cc20d7d60f84f93a42e7314efb2e6f5463fdb..784cd5fc6c08b7d58f752553c2bbbd1d20b22a49 100644 (file)
--- 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 8dd420bbd3b76f23ae94ac8972a4e2084baeb945..699319e70b20a2586779126b9b8887ad2a6c8ca1 100644 (file)
--- 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 38b31ec8cc8948dcd6e596d37fe177f0f2a073c4..ef88de5c1512cb346aa5bf59339ab14fe04d7e0b 100644 (file)
--- 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
    *