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/Socket.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java
index 27fa69131b5..a0f831c1701 100644
--- a/libjava/java/net/Socket.java
+++ b/libjava/java/net/Socket.java
@@ -1006,12 +1006,11 @@ public class Socket
       throw new SocketException("socket is closed");
     
     getImpl().close();
+    impl = null;
+    bound = false;
 
     if (getChannel() != null)
       getChannel().close();
-    
-    impl = null;
-    bound = false;
   }
 
   /**
-- 
cgit v1.2.3