From c531dd016b224f94eef10fdb562443aef5f64e61 Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Tue, 2 Dec 2003 15:23:23 +0000
Subject: 2003-12-02  Michael Koch  <konqueror@gmx.de>

	* java/net/DatagramSocket.java
	(close): Close associated DatagramChannel object.
	* java/net/ServerSocket.java
	* java/net/Socket.java
	(close): Reset impl and bound before calling getChannel().close() to
	prevent from loops.

From-SVN: r74183
---
 libjava/java/net/DatagramSocket.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'libjava/java/net/DatagramSocket.java')

diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java
index f4bc4ea79d5..e3edfcd6c39 100644
--- a/libjava/java/net/DatagramSocket.java
+++ b/libjava/java/net/DatagramSocket.java
@@ -232,6 +232,16 @@ public class DatagramSocket
 	    remotePort = -1;
 	    impl = null;
 	  }
+
+	try
+	  {
+	    if (getChannel() != null)
+	      getChannel().close();
+	  }
+	catch (IOException e)
+	  {
+	    // Do nothing.
+	  }
       }
   }
 
-- 
cgit v1.2.3