From: Ito Kazumitsu <kaz@maczuka.gcd.org>
Date: Sun, 21 Mar 2004 11:00:48 +0000 (+0000)
Subject: 2004-03-21  Ito Kazumitsu <kaz@maczuka.gcd.org>
X-Git-Tag: releases/gcc-4.0.0~9249
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de205e06bae4a2e9c4c186aa81c481dca4a71425;p=thirdparty%2Fgcc.git

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 e9730a02a260..ff1aa8d0d310 100644
--- 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 df338091291f..be3f8008d86b 100644
--- 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;
   }