From e9891de02aa044d88a21484443fc2e808b99e4a7 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Sat, 20 Jun 2009 14:17:09 +0000 Subject: * SocketResponder.cs: Made a little more robust. svn path=/trunk/mcs/; revision=136546 --- mcs/class/System/Test/System.Net/ChangeLog | 4 ++++ mcs/class/System/Test/System.Net/SocketResponder.cs | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'mcs/class/System/Test') diff --git a/mcs/class/System/Test/System.Net/ChangeLog b/mcs/class/System/Test/System.Net/ChangeLog index d5348f75f70..a857c66ed51 100644 --- a/mcs/class/System/Test/System.Net/ChangeLog +++ b/mcs/class/System/Test/System.Net/ChangeLog @@ -1,3 +1,7 @@ +2009-06-20 Gert Driesen + + * SocketResponder.cs: Made a little more robust. + 2009-06-20 Gert Driesen * HttpListener2Test.cs: Added test for bug #513849. diff --git a/mcs/class/System/Test/System.Net/SocketResponder.cs b/mcs/class/System/Test/System.Net/SocketResponder.cs index dd932ec4df0..6c4d8fb464f 100644 --- a/mcs/class/System/Test/System.Net/SocketResponder.cs +++ b/mcs/class/System/Test/System.Net/SocketResponder.cs @@ -97,6 +97,7 @@ namespace MonoTests.System.Net if (tcpListener != null) { tcpListener.Stop (); tcpListener = null; + Thread.Sleep (50); } } } @@ -104,20 +105,23 @@ namespace MonoTests.System.Net private void Listen () { while (!_stopped) { + Socket socket = null; try { - Socket socket = tcpListener.AcceptSocket (); + socket = tcpListener.AcceptSocket (); socket.Send (_requestHandler (socket)); try { socket.Shutdown (SocketShutdown.Receive); socket.Shutdown (SocketShutdown.Send); } catch { } - Thread.Sleep (500); - socket.Close (); } catch (SocketException ex) { // ignore interruption of blocking call if (ex.ErrorCode != SOCKET_CLOSED) throw; + } finally { + Thread.Sleep (500); + if (socket != null) + socket.Close (); } } } -- cgit v1.2.3