2002-10-03 Michael Koch <konqueror@gmx.de>

	* java/net/DatagramPacket.java
	(setLength): Fixed typo and be HTML-aware.
	* java/net/InetSocketAddress.java
	(InetSocketAddress): Correct initialization of hostname, fixed typo.
	(equals): Added comment about equality of InetSocketAddress objects.
	* java/net/ServerSocket.java
	(accept): Added checks.
	(isClosed): New stubbed method.
	* java/net/SocketOptions.java: Reindention.
	* java/net/SocketPermission
	(SocketPermission): Documentation fixed.

From-SVN: r57776

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4e7110f17d6a190c752ea101567657486e4e7b26..61b091524fd958aee87ede56be56e941e4a920d9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,4 +1,18 @@
-2002-09-30  Michael Koch  <konqueror@gmx.de>
+2002-10-03  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/DatagramPacket.java
+       (setLength): Fixed typo and be HTML-aware.
+       * java/net/InetSocketAddress.java
+       (InetSocketAddress): Correct initialization of hostname, fixed typo.
+       (equals): Added comment about equality of InetSocketAddress objects.
+       * java/net/ServerSocket.java
+       (accept): Added checks.
+       (isClosed): New stubbed method.
+       * java/net/SocketOptions.java: Reindention.
+       * java/net/SocketPermission
+       (SocketPermission): Documentation fixed.
+       
+2002-10-03  Michael Koch  <konqueror@gmx.de>
 
        * java/net/DatagramSocket.java
        (receive): Check with SecurityManager AFTER the packet is received,

diff --git a/libjava/java/net/DatagramPacket.java b/libjava/java/net/DatagramPacket.java
index 7fbb3f8da357c9ac1e165458976cb66600e62c41..7ca6c51a22bb1eec728955f2f65ac9eaded0bead 100644 (file)
--- a/libjava/java/net/DatagramPacket.java
+++ b/libjava/java/net/DatagramPacket.java
@@ -402,9 +402,9 @@ public final class DatagramPacket
   /**
    * Sets the length of the data in the buffer. 
    *
-   * @param length The new length.  (Where len <= buf.length)
+   * @param length The new length.  (Where len &lt;= buf.length)
    *
-   * @exception IllegalArgumentException f the length is negative or
+   * @exception IllegalArgumentException If the length is negative or
    * if the length is greater than the packet's data buffer length
    *
    * @since 1.1

diff --git a/libjava/java/net/InetSocketAddress.java b/libjava/java/net/InetSocketAddress.java
index 1f932a95b5f683991b7f34d92928589189c880cf..1b740dcc50785c34fc1f8ae7fa7c7a69ea26d384 100644 (file)
--- a/libjava/java/net/InetSocketAddress.java
+++ b/libjava/java/net/InetSocketAddress.java
@@ -57,7 +57,7 @@ public class InetSocketAddress extends SocketAddress
    * @param addr Address of the socket
    * @param port Port if the socket
    *
-   * @exception IllegalArgumentException If the port number is illegal
+   * @exception IllegalArgumentException If the port number is illegel
    */
   public InetSocketAddress(InetAddress addr, int port)
     throws IllegalArgumentException
@@ -67,15 +67,7 @@ public class InetSocketAddress extends SocketAddress
   
     this.addr = addr;
     this.port = port;
-
-    try
-      {
-        this.hostname = addr.getHostName ();
-      }
-    catch (UnknownHostException e)
-      {
-        this.hostname = "";
-      }
+    this.hostname = addr.getHostName ();
   }
 
   /**
@@ -140,6 +132,9 @@ public class InetSocketAddress extends SocketAddress
    */
   public final boolean equals (Object obj)
   {
+    // InetSocketAddress objects are equal when addr and port are equal.
+    // The hostname may differ.
+
     if (obj instanceof InetSocketAddress)
       {
         InetSocketAddress a = (InetSocketAddress) obj;

diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index 36f93e8b64c875dd2bb78e64fa6f8a95d4dc678c..b7c69913a05b82dd2711d49838848d0705a8ee71 100644 (file)
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -287,6 +287,13 @@ public class ServerSocket
    */
   public Socket accept () throws IOException
   {
+    if (impl == null)
+      throw new IOException ("Cannot initialize Socket implementation");
+
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      sm.checkListen (impl.getLocalPort ());
+
     Socket s = new Socket();
     implAccept (s);
 
@@ -358,6 +365,17 @@ public class ServerSocket
     return true;
   }
 
+  /**
+   * Returns true if the socket is closed, otherwise false
+   * 
+   * @since 1.4
+   */
+  public boolean isClosed()
+  {
+    // FIXME: implement this
+    return false;
+  }
+
   /**
    * Sets the value of SO_TIMEOUT.  A value of 0 implies that SO_TIMEOUT is
    * disabled (ie, operations never time out).  This is the number of 

diff --git a/libjava/java/net/SocketOptions.java b/libjava/java/net/SocketOptions.java
index 628e08e8de2564829a96a3d8649cefdfe494950a..f62afef9aab65f023973568d057cb51e4136c60e 100644 (file)
--- a/libjava/java/net/SocketOptions.java
+++ b/libjava/java/net/SocketOptions.java
@@ -60,7 +60,7 @@ public interface SocketOptions
    * @since 1.3
    */
   static final int SO_KEEPALIVE = 0x8;
-       
+
   /**
    * Option id for the SO_LINGER value
    */
@@ -106,13 +106,13 @@ public interface SocketOptions
   static final int SO_OOBINLINE = 0x1003; // 4099
 
   /**
-    * Option id for the TCP_NODELAY value
-    */
+   * Option id for the TCP_NODELAY value
+   */
   static final int TCP_NODELAY = 0x01; // 1
 
   /**
-    * Options id for the IP_MULTICAST_IF value
-    */
+   * Options id for the IP_MULTICAST_IF value
+   */
   static final int IP_MULTICAST_IF = 0x10; // 16
 
   /**

diff --git a/libjava/java/net/SocketPermission.java b/libjava/java/net/SocketPermission.java
index 061ec9c80fe609899963613ecf20682e00b37284..0f41395f36ab5846d3c77e82c510bca35b1439d9 100644 (file)
--- a/libjava/java/net/SocketPermission.java
+++ b/libjava/java/net/SocketPermission.java
@@ -121,7 +121,7 @@ public final class SocketPermission extends Permission
    * specified host/port combination and actions string.
    *
    * @param hostport The hostname/port number combination
-   * @param perms The actions string
+   * @param actions The actions string
    */
   public SocketPermission(String hostport, String actions)
   {