2004-03-21 Ito Kazumitsu <kaz@maczuka.gcd.org>

        * java/net/ServerSocket.java
        (accept): Close the socket when error occured.

From-SVN: r79774

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e9730a02a260ae7b54b100a84178f27af569979d..ff1aa8d0d3107ee0148931f660b808cbb14d67d5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-21  Ito Kazumitsu <kaz@maczuka.gcd.org>
+
+        * java/net/ServerSocket.java
+        (accept): Close the socket when error occured.
+
 2004-03-21  Jeroen Frijters  <jeroen@frijters.net>
 
        * java/net/URI.java (parseURI): Added unquoting.

diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java
index df338091291f71e03f7e88bdaa5b7c38157814f2..be3f8008d86b459908d57f25d6727e8924cbf612 100644 (file)
--- a/libjava/java/net/ServerSocket.java
+++ b/libjava/java/net/ServerSocket.java
@@ -323,7 +323,24 @@ public class ServerSocket
       sm.checkListen (impl.getLocalPort ());
 
     Socket socket = new Socket();
-    implAccept (socket);
+    
+    try
+      {
+        implAccept(socket);
+      }
+    catch (IOException e)
+      {
+       try
+         {
+           socket.close();
+         }
+       catch (IOException e2)
+         {
+         }
+       
+       throw e;
+      }
+    
     return socket;
   }