2003-12-09 Michael Koch <konqueror@gmx.de>

	* java/net/DatagramSocket.java
	(close): Directly return if socket is closed.
	* java/net/ServerSocket.java
	(close): Directly return if socket is closed.
	* java/net/Socket.java
	(close): Directly return if socket is closed.

From-SVN: r74470

libjava/ChangeLog

 2003-12-09  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/DatagramSocket.java
+	(close): Directly return if socket is closed.
+	* java/net/ServerSocket.java
+	(close): Directly return if socket is closed.
+	* java/net/Socket.java
+	(close): Directly return if socket is closed.
+
+2003-12-09  Michael Koch  <konqueror@gmx.de>
+
 	* gnu/java/nio/SelectorImpl.java
 	(implSelect): Throws IOException.
 	(select): Likewise.

libjava/java/net/DatagramSocket.java

@@ -216,8 +216,9 @@ public class DatagramSocket
    */
   public void close()
   {
-    if (!isClosed())
-      {
+    if (isClosed())
+      return;
+    
     try
       {
 	getImpl().close();
@@ -243,7 +244,6 @@ public class DatagramSocket
 	// Do nothing.
       }
   }
-  }
 
   /**
    * This method returns the remote address to which this socket is 

libjava/java/net/ServerSocket.java

@@ -353,8 +353,9 @@ public class ServerSocket
    */
   public void close () throws IOException
   {
-    if (!isClosed())
-      {
+    if (isClosed())
+      return;
+    
     impl.close();
     impl = null;
     bound = false;
@@ -362,7 +363,6 @@ public class ServerSocket
     if (getChannel() != null)
       getChannel().close();
   }
-  }
 
   /**
    * Returns the unique ServerSocketChannel object

libjava/java/net/Socket.java

@@ -1003,7 +1003,7 @@ public class Socket
   public synchronized void close ()  throws IOException
   {
     if (isClosed())
-      throw new SocketException("socket is closed");
+      return;
     
     getImpl().close();
     impl = null;