diff options
author | Michael Koch <konqueror@gmx.de> | 2003-03-03 08:26:52 +0000 |
---|---|---|
committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-03-03 08:26:52 +0000 |
commit | 6579ac0c00830fc5982afda361bc350ea2a84f7a (patch) | |
tree | 6bf9b70421fe052b23d2db697187f4f0a980aed1 /libjava/java/net/Socket.java | |
parent | 6e1b3a7c949003ce1051d5bff4d162a80b418122 (diff) | |
download | gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.zip gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.tar.gz gcc-6579ac0c00830fc5982afda361bc350ea2a84f7a.tar.bz2 |
2003-03-03 Michael Koch <konqueror@gmx.de>
* java/net/DatagramSocket.java
(connect): Merged comment from classpath.
(receive): Merged documentation from classpath.
* java/net/Socket.java
(setSoTimeout): Clarified documentation.
* java/net/URL.java
(getPath): Merged from classpath.
(getUserInfo): Merged from classpath.
(getQuery): Merged from classpath.
* java/net/URLStreamHandler.java
(toExternalForm): Merged from classpath.
From-SVN: r63714
Diffstat (limited to 'libjava/java/net/Socket.java')
-rw-r--r-- | libjava/java/net/Socket.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 005fd04..a71218f 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -692,10 +692,10 @@ public class Socket * this option implies that there is no timeout (ie, operations will * block forever). On systems that have separate read and write timeout * values, this method returns the read timeout. This - * value is in thousandths of a second (****????*****) + * value is in milliseconds. * - * @param timeout The length of the timeout in thousandth's of a second or - * 0 if not set + * @param timeout The length of the timeout in milliseconds, or + * 0 to indicate no timeout. * * @exception SocketException If an error occurs or Socket not connected * |