From 6579ac0c00830fc5982afda361bc350ea2a84f7a Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 3 Mar 2003 08:26:52 +0000 Subject: 2003-03-03 Michael Koch * 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 --- libjava/java/net/Socket.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/java/net/Socket.java') diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 005fd0461b2..a71218fe7ef 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 * -- cgit v1.2.3