aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-06-28 08:13:24 +0000
committerMichael Koch <konqueror@gmx.de>2003-06-28 08:13:24 +0000
commit6914ac86c1627f998dad060499d1972d5666cd0b (patch)
treef2b4dd7868517ef647ab84176c06d512cb65a515 /libjava
parent9520385c378bf08163e0bf3c70f6b0c1184f485b (diff)
2003-06-28 Michael Koch <konqueror@gmx.de>
* java/net/ServerSocket.java (setChannel): New method. * java/net/Socket.java (setChannel): New method. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@68631 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/java/net/ServerSocket.java8
-rw-r--r--libjava/java/net/Socket.java9
3 files changed, 24 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 434cc20d7d6..784cd5fc6c0 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 8dd420bbd3b..699319e70b2 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 38b31ec8cc8..ef88de5c151 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
*